nextcloud / server

apps/oauth2/lib/Db/AccessTokenMapper.php

Indentation +36 added lines, -36 removed lines

@@ -39,44 +39,44 @@
  */
 class AccessTokenMapper extends QBMapper {
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'oauth2_access_tokens');
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'oauth2_access_tokens');
+    }
 
-	/**
-	 * @param string $code
-	 * @return AccessToken
-	 * @throws AccessTokenNotFoundException
-	 */
-	public function getByCode(string $code): AccessToken {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->select('*')
-			->from($this->tableName)
-			->where($qb->expr()->eq('hashed_code', $qb->createNamedParameter(hash('sha512', $code))));
+    /**
+     * @param string $code
+     * @return AccessToken
+     * @throws AccessTokenNotFoundException
+     */
+    public function getByCode(string $code): AccessToken {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->select('*')
+            ->from($this->tableName)
+            ->where($qb->expr()->eq('hashed_code', $qb->createNamedParameter(hash('sha512', $code))));
 
-		try {
-			$token = $this->findEntity($qb);
-		} catch (IMapperException $e) {
-			throw new AccessTokenNotFoundException('Could not find access token', 0, $e);
-		}
+        try {
+            $token = $this->findEntity($qb);
+        } catch (IMapperException $e) {
+            throw new AccessTokenNotFoundException('Could not find access token', 0, $e);
+        }
 
-		return $token;
-	}
+        return $token;
+    }
 
-	/**
-	 * delete all access token from a given client
-	 *
-	 * @param int $id
-	 */
-	public function deleteByClientId(int $id) {
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->delete($this->tableName)
-			->where($qb->expr()->eq('client_id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-		$qb->executeStatement();
-	}
+    /**
+     * delete all access token from a given client
+     *
+     * @param int $id
+     */
+    public function deleteByClientId(int $id) {
+        $qb = $this->db->getQueryBuilder();
+        $qb
+            ->delete($this->tableName)
+            ->where($qb->expr()->eq('client_id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+        $qb->executeStatement();
+    }
 }

apps/dav/lib/CalDAV/CalDavBackend.php

Indentation +2764 added lines, -2764 removed lines

@@ -96,2768 +96,2768 @@
  * @package OCA\DAV\CalDAV
  */
 class CalDavBackend extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
-	public const CALENDAR_TYPE_CALENDAR = 0;
-	public const CALENDAR_TYPE_SUBSCRIPTION = 1;
-
-	public const PERSONAL_CALENDAR_URI = 'personal';
-	public const PERSONAL_CALENDAR_NAME = 'Personal';
-
-	public const RESOURCE_BOOKING_CALENDAR_URI = 'calendar';
-	public const RESOURCE_BOOKING_CALENDAR_NAME = 'Calendar';
-
-	/**
-	 * We need to specify a max date, because we need to stop *somewhere*
-	 *
-	 * On 32 bit system the maximum for a signed integer is 2147483647, so
-	 * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
-	 * in 2038-01-19 to avoid problems when the date is converted
-	 * to a unix timestamp.
-	 */
-	public const MAX_DATE = '2038-01-01';
-
-	public const ACCESS_PUBLIC = 4;
-	public const CLASSIFICATION_PUBLIC = 0;
-	public const CLASSIFICATION_PRIVATE = 1;
-	public const CLASSIFICATION_CONFIDENTIAL = 2;
-
-	/**
-	 * List of CalDAV properties, and how they map to database field names
-	 * Add your own properties by simply adding on to this array.
-	 *
-	 * Note that only string-based properties are supported here.
-	 *
-	 * @var array
-	 */
-	public $propertyMap = [
-		'{DAV:}displayname' => 'displayname',
-		'{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
-		'{urn:ietf:params:xml:ns:caldav}calendar-timezone' => 'timezone',
-		'{http://apple.com/ns/ical/}calendar-order' => 'calendarorder',
-		'{http://apple.com/ns/ical/}calendar-color' => 'calendarcolor',
-	];
-
-	/**
-	 * List of subscription properties, and how they map to database field names.
-	 *
-	 * @var array
-	 */
-	public $subscriptionPropertyMap = [
-		'{DAV:}displayname' => 'displayname',
-		'{http://apple.com/ns/ical/}refreshrate' => 'refreshrate',
-		'{http://apple.com/ns/ical/}calendar-order' => 'calendarorder',
-		'{http://apple.com/ns/ical/}calendar-color' => 'calendarcolor',
-		'{http://calendarserver.org/ns/}subscribed-strip-todos' => 'striptodos',
-		'{http://calendarserver.org/ns/}subscribed-strip-alarms' => 'stripalarms',
-		'{http://calendarserver.org/ns/}subscribed-strip-attachments' => 'stripattachments',
-	];
-
-	/** @var array properties to index */
-	public static $indexProperties = ['CATEGORIES', 'COMMENT', 'DESCRIPTION',
-		'LOCATION', 'RESOURCES', 'STATUS', 'SUMMARY', 'ATTENDEE', 'CONTACT',
-		'ORGANIZER'];
-
-	/** @var array parameters to index */
-	public static $indexParameters = [
-		'ATTENDEE' => ['CN'],
-		'ORGANIZER' => ['CN'],
-	];
-
-	/**
-	 * @var string[] Map of uid => display name
-	 */
-	protected $userDisplayNames;
-
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var Backend */
-	private $calendarSharingBackend;
-
-	/** @var Principal */
-	private $principalBackend;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IEventDispatcher */
-	private $dispatcher;
-
-	/** @var EventDispatcherInterface */
-	private $legacyDispatcher;
-
-	/** @var bool */
-	private $legacyEndpoint;
-
-	/** @var string */
-	private $dbObjectPropertiesTable = 'calendarobjects_props';
-
-	/**
-	 * CalDavBackend constructor.
-	 *
-	 * @param IDBConnection $db
-	 * @param Principal $principalBackend
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param ISecureRandom $random
-	 * @param ILogger $logger
-	 * @param IEventDispatcher $dispatcher
-	 * @param EventDispatcherInterface $legacyDispatcher
-	 * @param bool $legacyEndpoint
-	 */
-	public function __construct(IDBConnection $db,
-								Principal $principalBackend,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								ISecureRandom $random,
-								ILogger $logger,
-								IEventDispatcher $dispatcher,
-								EventDispatcherInterface $legacyDispatcher,
-								bool $legacyEndpoint = false) {
-		$this->db = $db;
-		$this->principalBackend = $principalBackend;
-		$this->userManager = $userManager;
-		$this->calendarSharingBackend = new Backend($this->db, $this->userManager, $groupManager, $principalBackend, 'calendar');
-		$this->random = $random;
-		$this->logger = $logger;
-		$this->dispatcher = $dispatcher;
-		$this->legacyDispatcher = $legacyDispatcher;
-		$this->legacyEndpoint = $legacyEndpoint;
-	}
-
-	/**
-	 * Return the number of calendars for a principal
-	 *
-	 * By default this excludes the automatically generated birthday calendar
-	 *
-	 * @param $principalUri
-	 * @param bool $excludeBirthday
-	 * @return int
-	 */
-	public function getCalendarsForUserCount($principalUri, $excludeBirthday = true) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$query = $this->db->getQueryBuilder();
-		$query->select($query->func()->count('*'))
-			->from('calendars');
-
-		if ($principalUri === '') {
-			$query->where($query->expr()->emptyString('principaluri'));
-		} else {
-			$query->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-		}
-
-		if ($excludeBirthday) {
-			$query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
-		}
-
-		$result = $query->executeQuery();
-		$column = (int)$result->fetchOne();
-		$result->closeCursor();
-		return $column;
-	}
-
-	/**
-	 * Returns a list of calendars for a principal.
-	 *
-	 * Every project is an array with the following keys:
-	 *  * id, a unique id that will be used by other functions to modify the
-	 *    calendar. This can be the same as the uri or a database key.
-	 *  * uri, which the basename of the uri with which the calendar is
-	 *    accessed.
-	 *  * principaluri. The owner of the calendar. Almost always the same as
-	 *    principalUri passed to this method.
-	 *
-	 * Furthermore it can contain webdav properties in clark notation. A very
-	 * common one is '{DAV:}displayname'.
-	 *
-	 * Many clients also require:
-	 * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-	 * For this property, you can just return an instance of
-	 * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
-	 *
-	 * If you return {http://sabredav.org/ns}read-only and set the value to 1,
-	 * ACL will automatically be put in read-only mode.
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	public function getCalendarsForUser($principalUri) {
-		$principalUriOriginal = $principalUri;
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)
-			->from('calendars')
-			->orderBy('calendarorder', 'ASC');
-
-		if ($principalUri === '') {
-			$query->where($query->expr()->emptyString('principaluri'));
-		} else {
-			$query->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
-		}
-
-		$result = $query->executeQuery();
-
-		$calendars = [];
-		while ($row = $result->fetch()) {
-			$row['principaluri'] = (string) $row['principaluri'];
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
-			];
-
-			foreach ($this->propertyMap as $xmlName => $dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$this->addOwnerPrincipal($calendar);
-
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-		$result->closeCursor();
-
-		// query for shared calendars
-		$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
-		$principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
-
-		$principals[] = $principalUri;
-
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'a.id';
-		$fields[] = 'a.uri';
-		$fields[] = 'a.synctoken';
-		$fields[] = 'a.components';
-		$fields[] = 'a.principaluri';
-		$fields[] = 'a.transparent';
-		$fields[] = 's.access';
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)
-			->from('dav_shares', 's')
-			->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
-			->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
-			->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
-			->setParameter('type', 'calendar')
-			->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
-
-		$result = $query->executeQuery();
-
-		$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
-		while ($row = $result->fetch()) {
-			$row['principaluri'] = (string) $row['principaluri'];
-			if ($row['principaluri'] === $principalUri) {
-				continue;
-			}
-
-			$readOnly = (int) $row['access'] === Backend::ACCESS_READ;
-			if (isset($calendars[$row['id']])) {
-				if ($readOnly) {
-					// New share can not have more permissions then the old one.
-					continue;
-				}
-				if (isset($calendars[$row['id']][$readOnlyPropertyName]) &&
-					$calendars[$row['id']][$readOnlyPropertyName] === 0) {
-					// Old share is already read-write, no more permissions can be gained
-					continue;
-				}
-			}
-
-			[, $name] = Uri\split($row['principaluri']);
-			$uri = $row['uri'] . '_shared_by_' . $name;
-			$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $uri,
-				'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				$readOnlyPropertyName => $readOnly,
-			];
-
-			foreach ($this->propertyMap as $xmlName => $dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$this->addOwnerPrincipal($calendar);
-
-			$calendars[$calendar['id']] = $calendar;
-		}
-		$result->closeCursor();
-
-		return array_values($calendars);
-	}
-
-	/**
-	 * @param $principalUri
-	 * @return array
-	 */
-	public function getUsersOwnCalendars($principalUri) {
-		$principalUri = $this->convertPrincipal($principalUri, true);
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->orderBy('calendarorder', 'ASC');
-		$stmt = $query->executeQuery();
-		$calendars = [];
-		while ($row = $stmt->fetch()) {
-			$row['principaluri'] = (string) $row['principaluri'];
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-			];
-			foreach ($this->propertyMap as $xmlName => $dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$this->addOwnerPrincipal($calendar);
-
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-		$stmt->closeCursor();
-		return array_values($calendars);
-	}
-
-
-	/**
-	 * @param $uid
-	 * @return string
-	 */
-	private function getUserDisplayName($uid) {
-		if (!isset($this->userDisplayNames[$uid])) {
-			$user = $this->userManager->get($uid);
-
-			if ($user instanceof IUser) {
-				$this->userDisplayNames[$uid] = $user->getDisplayName();
-			} else {
-				$this->userDisplayNames[$uid] = $uid;
-			}
-		}
-
-		return $this->userDisplayNames[$uid];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getPublicCalendars() {
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'a.id';
-		$fields[] = 'a.uri';
-		$fields[] = 'a.synctoken';
-		$fields[] = 'a.components';
-		$fields[] = 'a.principaluri';
-		$fields[] = 'a.transparent';
-		$fields[] = 's.access';
-		$fields[] = 's.publicuri';
-		$calendars = [];
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select($fields)
-			->from('dav_shares', 's')
-			->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
-			->where($query->expr()->in('s.access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
-			->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
-			->executeQuery();
-
-		while ($row = $result->fetch()) {
-			$row['principaluri'] = (string) $row['principaluri'];
-			[, $name] = Uri\split($row['principaluri']);
-			$row['displayname'] = $row['displayname'] . "($name)";
-			$components = [];
-			if ($row['components']) {
-				$components = explode(',',$row['components']);
-			}
-			$calendar = [
-				'id' => $row['id'],
-				'uri' => $row['publicuri'],
-				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
-			];
-
-			foreach ($this->propertyMap as $xmlName => $dbName) {
-				$calendar[$xmlName] = $row[$dbName];
-			}
-
-			$this->addOwnerPrincipal($calendar);
-
-			if (!isset($calendars[$calendar['id']])) {
-				$calendars[$calendar['id']] = $calendar;
-			}
-		}
-		$result->closeCursor();
-
-		return array_values($calendars);
-	}
-
-	/**
-	 * @param string $uri
-	 * @return array
-	 * @throws NotFound
-	 */
-	public function getPublicCalendar($uri) {
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'a.id';
-		$fields[] = 'a.uri';
-		$fields[] = 'a.synctoken';
-		$fields[] = 'a.components';
-		$fields[] = 'a.principaluri';
-		$fields[] = 'a.transparent';
-		$fields[] = 's.access';
-		$fields[] = 's.publicuri';
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select($fields)
-			->from('dav_shares', 's')
-			->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
-			->where($query->expr()->in('s.access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
-			->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
-			->andWhere($query->expr()->eq('s.publicuri', $query->createNamedParameter($uri)))
-			->executeQuery();
-
-		$row = $result->fetch();
-
-		$result->closeCursor();
-
-		if ($row === false) {
-			throw new NotFound('Node with name \'' . $uri . '\' could not be found');
-		}
-
-		$row['principaluri'] = (string) $row['principaluri'];
-		[, $name] = Uri\split($row['principaluri']);
-		$row['displayname'] = $row['displayname'] . ' ' . "($name)";
-		$components = [];
-		if ($row['components']) {
-			$components = explode(',',$row['components']);
-		}
-		$calendar = [
-			'id' => $row['id'],
-			'uri' => $row['publicuri'],
-			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
-		];
-
-		foreach ($this->propertyMap as $xmlName => $dbName) {
-			$calendar[$xmlName] = $row[$dbName];
-		}
-
-		$this->addOwnerPrincipal($calendar);
-
-		return $calendar;
-	}
-
-	/**
-	 * @param string $principal
-	 * @param string $uri
-	 * @return array|null
-	 */
-	public function getCalendarByUri($principal, $uri) {
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
-			->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
-			->setMaxResults(1);
-		$stmt = $query->executeQuery();
-
-		$row = $stmt->fetch();
-		$stmt->closeCursor();
-		if ($row === false) {
-			return null;
-		}
-
-		$row['principaluri'] = (string) $row['principaluri'];
-		$components = [];
-		if ($row['components']) {
-			$components = explode(',',$row['components']);
-		}
-
-		$calendar = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-		];
-
-		foreach ($this->propertyMap as $xmlName => $dbName) {
-			$calendar[$xmlName] = $row[$dbName];
-		}
-
-		$this->addOwnerPrincipal($calendar);
-
-		return $calendar;
-	}
-
-	/**
-	 * @param $calendarId
-	 * @return array|null
-	 */
-	public function getCalendarById($calendarId) {
-		$fields = array_values($this->propertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'synctoken';
-		$fields[] = 'components';
-		$fields[] = 'principaluri';
-		$fields[] = 'transparent';
-
-		// Making fields a comma-delimited list
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)->from('calendars')
-			->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)))
-			->setMaxResults(1);
-		$stmt = $query->executeQuery();
-
-		$row = $stmt->fetch();
-		$stmt->closeCursor();
-		if ($row === false) {
-			return null;
-		}
-
-		$row['principaluri'] = (string) $row['principaluri'];
-		$components = [];
-		if ($row['components']) {
-			$components = explode(',',$row['components']);
-		}
-
-		$calendar = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-		];
-
-		foreach ($this->propertyMap as $xmlName => $dbName) {
-			$calendar[$xmlName] = $row[$dbName];
-		}
-
-		$this->addOwnerPrincipal($calendar);
-
-		return $calendar;
-	}
-
-	/**
-	 * @param $subscriptionId
-	 */
-	public function getSubscriptionById($subscriptionId) {
-		$fields = array_values($this->subscriptionPropertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'source';
-		$fields[] = 'synctoken';
-		$fields[] = 'principaluri';
-		$fields[] = 'lastmodified';
-
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)
-			->from('calendarsubscriptions')
-			->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
-			->orderBy('calendarorder', 'asc');
-		$stmt = $query->executeQuery();
-
-		$row = $stmt->fetch();
-		$stmt->closeCursor();
-		if ($row === false) {
-			return null;
-		}
-
-		$row['principaluri'] = (string) $row['principaluri'];
-		$subscription = [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'principaluri' => $row['principaluri'],
-			'source' => $row['source'],
-			'lastmodified' => $row['lastmodified'],
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-		];
-
-		foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
-			if (!is_null($row[$dbName])) {
-				$subscription[$xmlName] = $row[$dbName];
-			}
-		}
-
-		return $subscription;
-	}
-
-	/**
-	 * Creates a new calendar for a principal.
-	 *
-	 * If the creation was a success, an id must be returned that can be used to reference
-	 * this calendar in other methods, such as updateCalendar.
-	 *
-	 * @param string $principalUri
-	 * @param string $calendarUri
-	 * @param array $properties
-	 * @return int
-	 */
-	public function createCalendar($principalUri, $calendarUri, array $properties) {
-		$values = [
-			'principaluri' => $this->convertPrincipal($principalUri, true),
-			'uri' => $calendarUri,
-			'synctoken' => 1,
-			'transparent' => 0,
-			'components' => 'VEVENT,VTODO',
-			'displayname' => $calendarUri
-		];
-
-		// Default value
-		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-		if (isset($properties[$sccs])) {
-			if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
-				throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
-			}
-			$values['components'] = implode(',',$properties[$sccs]->getValue());
-		} elseif (isset($properties['components'])) {
-			// Allow to provide components internally without having
-			// to create a SupportedCalendarComponentSet object
-			$values['components'] = $properties['components'];
-		}
-
-		$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
-		if (isset($properties[$transp])) {
-			$values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');
-		}
-
-		foreach ($this->propertyMap as $xmlName => $dbName) {
-			if (isset($properties[$xmlName])) {
-				$values[$dbName] = $properties[$xmlName];
-			}
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendars');
-		foreach ($values as $column => $value) {
-			$query->setValue($column, $query->createNamedParameter($value));
-		}
-		$query->executeStatement();
-		$calendarId = $query->getLastInsertId();
-
-		$calendarData = $this->getCalendarById($calendarId);
-		$this->dispatcher->dispatchTyped(new CalendarCreatedEvent((int)$calendarId, $calendarData));
-		$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::createCalendar',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $calendarData,
-			]));
-
-		return $calendarId;
-	}
-
-	/**
-	 * Updates properties for a calendar.
-	 *
-	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-	 * To do the actual updates, you must tell this object which properties
-	 * you're going to process with the handle() method.
-	 *
-	 * Calling the handle method is like telling the PropPatch object "I
-	 * promise I can handle updating this property".
-	 *
-	 * Read the PropPatch documentation for more info and examples.
-	 *
-	 * @param mixed $calendarId
-	 * @param PropPatch $propPatch
-	 * @return void
-	 */
-	public function updateCalendar($calendarId, PropPatch $propPatch) {
-		$supportedProperties = array_keys($this->propertyMap);
-		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
-
-		$propPatch->handle($supportedProperties, function ($mutations) use ($calendarId) {
-			$newValues = [];
-			foreach ($mutations as $propertyName => $propertyValue) {
-				switch ($propertyName) {
-					case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp':
-						$fieldName = 'transparent';
-						$newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
-						break;
-					default:
-						$fieldName = $this->propertyMap[$propertyName];
-						$newValues[$fieldName] = $propertyValue;
-						break;
-				}
-			}
-			$query = $this->db->getQueryBuilder();
-			$query->update('calendars');
-			foreach ($newValues as $fieldName => $value) {
-				$query->set($fieldName, $query->createNamedParameter($value));
-			}
-			$query->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
-			$query->executeStatement();
-
-			$this->addChange($calendarId, "", 2);
-
-			$calendarData = $this->getCalendarById($calendarId);
-			$shares = $this->getShares($calendarId);
-			$this->dispatcher->dispatchTyped(new CalendarUpdatedEvent((int)$calendarId, $calendarData, $shares, $mutations));
-			$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::updateCalendar',
-				[
-					'calendarId' => $calendarId,
-					'calendarData' => $calendarData,
-					'shares' => $shares,
-					'propertyMutations' => $mutations,
-				]));
-
-			return true;
-		});
-	}
-
-	/**
-	 * Delete a calendar and all it's objects
-	 *
-	 * @param mixed $calendarId
-	 * @return void
-	 */
-	public function deleteCalendar($calendarId) {
-		$calendarData = $this->getCalendarById($calendarId);
-		$shares = $this->getShares($calendarId);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `calendartype` = ?');
-		$stmt->execute([$calendarId, self::CALENDAR_TYPE_CALENDAR]);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendars` WHERE `id` = ?');
-		$stmt->execute([$calendarId]);
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarchanges` WHERE `calendarid` = ? AND `calendartype` = ?');
-		$stmt->execute([$calendarId, self::CALENDAR_TYPE_CALENDAR]);
-
-		$this->calendarSharingBackend->deleteAllShares($calendarId);
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)))
-			->executeStatement();
-
-		// Only dispatch if we actually deleted anything
-		if ($calendarData) {
-			$this->dispatcher->dispatchTyped(new CalendarDeletedEvent((int)$calendarId, $calendarData, $shares));
-		}
-	}
-
-	/**
-	 * Delete all of an user's shares
-	 *
-	 * @param string $principaluri
-	 * @return void
-	 */
-	public function deleteAllSharesByUser($principaluri) {
-		$this->calendarSharingBackend->deleteAllSharesByUser($principaluri);
-	}
-
-	/**
-	 * Returns all calendar objects within a calendar.
-	 *
-	 * Every item contains an array with the following keys:
-	 *   * calendardata - The iCalendar-compatible calendar data
-	 *   * uri - a unique key which will be used to construct the uri. This can
-	 *     be any arbitrary string, but making sure it ends with '.ics' is a
-	 *     good idea. This is only the basename, or filename, not the full
-	 *     path.
-	 *   * lastmodified - a timestamp of the last modification time
-	 *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-	 *   '"abcdef"')
-	 *   * size - The size of the calendar objects, in bytes.
-	 *   * component - optional, a string containing the type of object, such
-	 *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
-	 *     the Content-Type header.
-	 *
-	 * Note that the etag is optional, but it's highly encouraged to return for
-	 * speed reasons.
-	 *
-	 * The calendardata is also optional. If it's not returned
-	 * 'getCalendarObject' will be called later, which *is* expected to return
-	 * calendardata.
-	 *
-	 * If neither etag or size are specified, the calendardata will be
-	 * used/fetched to determine these numbers. If both are specified the
-	 * amount of times this is needed is reduced by a great degree.
-	 *
-	 * @param mixed $calendarId
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function getCalendarObjects($calendarId, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype', 'classification'])
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-		$stmt = $query->executeQuery();
-
-		$result = [];
-		foreach ($stmt->fetchAll() as $row) {
-			$result[] = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'lastmodified' => $row['lastmodified'],
-				'etag' => '"' . $row['etag'] . '"',
-				'calendarid' => $row['calendarid'],
-				'size' => (int)$row['size'],
-				'component' => strtolower($row['componenttype']),
-				'classification' => (int)$row['classification']
-			];
-		}
-		$stmt->closeCursor();
-
-		return $result;
-	}
-
-	/**
-	 * Returns information from a single calendar object, based on it's object
-	 * uri.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * The returned array must have the same keys as getCalendarObjects. The
-	 * 'calendardata' object is required here though, while it's not required
-	 * for getCalendarObjects.
-	 *
-	 * This method must return null if the object did not exist.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param int $calendarType
-	 * @return array|null
-	 */
-	public function getCalendarObject($calendarId, $objectUri, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-		$stmt = $query->executeQuery();
-		$row = $stmt->fetch();
-		$stmt->closeCursor();
-
-		if (!$row) {
-			return null;
-		}
-
-		return [
-			'id' => $row['id'],
-			'uri' => $row['uri'],
-			'lastmodified' => $row['lastmodified'],
-			'etag' => '"' . $row['etag'] . '"',
-			'calendarid' => $row['calendarid'],
-			'size' => (int)$row['size'],
-			'calendardata' => $this->readBlob($row['calendardata']),
-			'component' => strtolower($row['componenttype']),
-			'classification' => (int)$row['classification']
-		];
-	}
-
-	/**
-	 * Returns a list of calendar objects.
-	 *
-	 * This method should work identical to getCalendarObject, but instead
-	 * return all the calendar objects in the list as an array.
-	 *
-	 * If the backend supports this, it may allow for some speed-ups.
-	 *
-	 * @param mixed $calendarId
-	 * @param string[] $uris
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function getMultipleCalendarObjects($calendarId, array $uris, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
-		if (empty($uris)) {
-			return [];
-		}
-
-		$chunks = array_chunk($uris, 100);
-		$objects = [];
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->in('uri', $query->createParameter('uri')))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-
-		foreach ($chunks as $uris) {
-			$query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->executeQuery();
-
-			while ($row = $result->fetch()) {
-				$objects[] = [
-					'id' => $row['id'],
-					'uri' => $row['uri'],
-					'lastmodified' => $row['lastmodified'],
-					'etag' => '"' . $row['etag'] . '"',
-					'calendarid' => $row['calendarid'],
-					'size' => (int)$row['size'],
-					'calendardata' => $this->readBlob($row['calendardata']),
-					'component' => strtolower($row['componenttype']),
-					'classification' => (int)$row['classification']
-				];
-			}
-			$result->closeCursor();
-		}
-
-		return $objects;
-	}
-
-	/**
-	 * Creates a new calendar object.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * It is possible return an etag from this function, which will be used in
-	 * the response to this PUT request. Note that the ETag must be surrounded
-	 * by double-quotes.
-	 *
-	 * However, you should only really return this ETag if you don't mangle the
-	 * calendar-data. If the result of a subsequent GET to this object is not
-	 * the exact same as this request body, you should omit the ETag.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @param int $calendarType
-	 * @return string
-	 */
-	public function createCalendarObject($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$extraData = $this->getDenormalizedData($calendarData);
-
-		$q = $this->db->getQueryBuilder();
-		$q->select($q->func()->count('*'))
-			->from('calendarobjects')
-			->where($q->expr()->eq('calendarid', $q->createNamedParameter($calendarId)))
-			->andWhere($q->expr()->eq('uid', $q->createNamedParameter($extraData['uid'])))
-			->andWhere($q->expr()->eq('calendartype', $q->createNamedParameter($calendarType)));
-
-		$result = $q->executeQuery();
-		$count = (int) $result->fetchOne();
-		$result->closeCursor();
-
-		if ($count !== 0) {
-			throw new \Sabre\DAV\Exception\BadRequest('Calendar object with uid already exists in this calendar collection.');
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendarobjects')
-			->values([
-				'calendarid' => $query->createNamedParameter($calendarId),
-				'uri' => $query->createNamedParameter($objectUri),
-				'calendardata' => $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB),
-				'lastmodified' => $query->createNamedParameter(time()),
-				'etag' => $query->createNamedParameter($extraData['etag']),
-				'size' => $query->createNamedParameter($extraData['size']),
-				'componenttype' => $query->createNamedParameter($extraData['componentType']),
-				'firstoccurence' => $query->createNamedParameter($extraData['firstOccurence']),
-				'lastoccurence' => $query->createNamedParameter($extraData['lastOccurence']),
-				'classification' => $query->createNamedParameter($extraData['classification']),
-				'uid' => $query->createNamedParameter($extraData['uid']),
-				'calendartype' => $query->createNamedParameter($calendarType),
-			])
-			->executeStatement();
-
-		$this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
-		$this->addChange($calendarId, $objectUri, 1, $calendarType);
-
-		$objectRow = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
-		if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
-			$calendarRow = $this->getCalendarById($calendarId);
-			$shares = $this->getShares($calendarId);
-
-			$this->dispatcher->dispatchTyped(new CalendarObjectCreatedEvent((int)$calendarId, $calendarRow, $shares, $objectRow));
-			$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject',
-				[
-					'calendarId' => $calendarId,
-					'calendarData' => $calendarRow,
-					'shares' => $shares,
-					'objectData' => $objectRow,
-				]
-			));
-		} else {
-			$subscriptionRow = $this->getSubscriptionById($calendarId);
-
-			$this->dispatcher->dispatchTyped(new CachedCalendarObjectCreatedEvent((int)$calendarId, $subscriptionRow, [], $objectRow));
-			$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject',
-				[
-					'subscriptionId' => $calendarId,
-					'calendarData' => $subscriptionRow,
-					'shares' => [],
-					'objectData' => $objectRow,
-				]
-			));
-		}
-
-		return '"' . $extraData['etag'] . '"';
-	}
-
-	/**
-	 * Updates an existing calendarobject, based on it's uri.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * It is possible return an etag from this function, which will be used in
-	 * the response to this PUT request. Note that the ETag must be surrounded
-	 * by double-quotes.
-	 *
-	 * However, you should only really return this ETag if you don't mangle the
-	 * calendar-data. If the result of a subsequent GET to this object is not
-	 * the exact same as this request body, you should omit the ETag.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @param int $calendarType
-	 * @return string
-	 */
-	public function updateCalendarObject($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$extraData = $this->getDenormalizedData($calendarData);
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendarobjects')
-				->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
-				->set('lastmodified', $query->createNamedParameter(time()))
-				->set('etag', $query->createNamedParameter($extraData['etag']))
-				->set('size', $query->createNamedParameter($extraData['size']))
-				->set('componenttype', $query->createNamedParameter($extraData['componentType']))
-				->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
-				->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
-				->set('classification', $query->createNamedParameter($extraData['classification']))
-				->set('uid', $query->createNamedParameter($extraData['uid']))
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)))
-			->executeStatement();
-
-		$this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
-		$this->addChange($calendarId, $objectUri, 2, $calendarType);
-
-		$objectRow = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
-		if (is_array($objectRow)) {
-			if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
-				$calendarRow = $this->getCalendarById($calendarId);
-				$shares = $this->getShares($calendarId);
-
-				$this->dispatcher->dispatchTyped(new CalendarObjectUpdatedEvent((int)$calendarId, $calendarRow, $shares, $objectRow));
-				$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', new GenericEvent(
-					'\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject',
-					[
-						'calendarId' => $calendarId,
-						'calendarData' => $calendarRow,
-						'shares' => $shares,
-						'objectData' => $objectRow,
-					]
-				));
-			} else {
-				$subscriptionRow = $this->getSubscriptionById($calendarId);
-
-				$this->dispatcher->dispatchTyped(new CachedCalendarObjectUpdatedEvent((int)$calendarId, $subscriptionRow, [], $objectRow));
-				$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject', new GenericEvent(
-					'\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject',
-					[
-						'subscriptionId' => $calendarId,
-						'calendarData' => $subscriptionRow,
-						'shares' => [],
-						'objectData' => $objectRow,
-					]
-				));
-			}
-		}
-
-		return '"' . $extraData['etag'] . '"';
-	}
-
-	/**
-	 * @param int $calendarObjectId
-	 * @param int $classification
-	 */
-	public function setClassification($calendarObjectId, $classification) {
-		if (!in_array($classification, [
-			self::CLASSIFICATION_PUBLIC, self::CLASSIFICATION_PRIVATE, self::CLASSIFICATION_CONFIDENTIAL
-		])) {
-			throw new \InvalidArgumentException();
-		}
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendarobjects')
-			->set('classification', $query->createNamedParameter($classification))
-			->where($query->expr()->eq('id', $query->createNamedParameter($calendarObjectId)))
-			->executeStatement();
-	}
-
-	/**
-	 * Deletes an existing calendar object.
-	 *
-	 * The object uri is only the basename, or filename and not a full path.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param int $calendarType
-	 * @return void
-	 */
-	public function deleteCalendarObject($calendarId, $objectUri, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$data = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
-		if (is_array($data)) {
-			if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
-				$calendarRow = $this->getCalendarById($calendarId);
-				$shares = $this->getShares($calendarId);
-
-				$this->dispatcher->dispatchTyped(new CalendarObjectDeletedEvent((int)$calendarId, $calendarRow, $shares, $data));
-				$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', new GenericEvent(
-					'\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject',
-					[
-						'calendarId' => $calendarId,
-						'calendarData' => $calendarRow,
-						'shares' => $shares,
-						'objectData' => $data,
-					]
-				));
-			} else {
-				$subscriptionRow = $this->getSubscriptionById($calendarId);
-
-				$this->dispatcher->dispatchTyped(new CachedCalendarObjectDeletedEvent((int)$calendarId, $subscriptionRow, [], $data));
-				$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject', new GenericEvent(
-					'\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject',
-					[
-						'subscriptionId' => $calendarId,
-						'calendarData' => $subscriptionRow,
-						'shares' => [],
-						'objectData' => $data,
-					]
-				));
-			}
-		}
-
-		$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ? AND `calendartype` = ?');
-		$stmt->execute([$calendarId, $objectUri, $calendarType]);
-
-		if (is_array($data)) {
-			$this->purgeProperties($calendarId, $data['id'], $calendarType);
-		}
-
-		$this->addChange($calendarId, $objectUri, 3, $calendarType);
-	}
-
-	/**
-	 * Performs a calendar-query on the contents of this calendar.
-	 *
-	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
-	 * calendar-query it is possible for a client to request a specific set of
-	 * object, based on contents of iCalendar properties, date-ranges and
-	 * iCalendar component types (VTODO, VEVENT).
-	 *
-	 * This method should just return a list of (relative) urls that match this
-	 * query.
-	 *
-	 * The list of filters are specified as an array. The exact array is
-	 * documented by Sabre\CalDAV\CalendarQueryParser.
-	 *
-	 * Note that it is extremely likely that getCalendarObject for every path
-	 * returned from this method will be called almost immediately after. You
-	 * may want to anticipate this to speed up these requests.
-	 *
-	 * This method provides a default implementation, which parses *all* the
-	 * iCalendar objects in the specified calendar.
-	 *
-	 * This default may well be good enough for personal use, and calendars
-	 * that aren't very large. But if you anticipate high usage, big calendars
-	 * or high loads, you are strongly advised to optimize certain paths.
-	 *
-	 * The best way to do so is override this method and to optimize
-	 * specifically for 'common filters'.
-	 *
-	 * Requests that are extremely common are:
-	 *   * requests for just VEVENTS
-	 *   * requests for just VTODO
-	 *   * requests with a time-range-filter on either VEVENT or VTODO.
-	 *
-	 * ..and combinations of these requests. It may not be worth it to try to
-	 * handle every possible situation and just rely on the (relatively
-	 * easy to use) CalendarQueryValidator to handle the rest.
-	 *
-	 * Note that especially time-range-filters may be difficult to parse. A
-	 * time-range filter specified on a VEVENT must for instance also handle
-	 * recurrence rules correctly.
-	 * A good example of how to interprete all these filters can also simply
-	 * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-	 * as possible, so it gives you a good idea on what type of stuff you need
-	 * to think of.
-	 *
-	 * @param mixed $calendarId
-	 * @param array $filters
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function calendarQuery($calendarId, array $filters, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
-		$componentType = null;
-		$requirePostFilter = true;
-		$timeRange = null;
-
-		// if no filters were specified, we don't need to filter after a query
-		if (!$filters['prop-filters'] && !$filters['comp-filters']) {
-			$requirePostFilter = false;
-		}
-
-		// Figuring out if there's a component filter
-		if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
-			$componentType = $filters['comp-filters'][0]['name'];
-
-			// Checking if we need post-filters
-			if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
-				$requirePostFilter = false;
-			}
-			// There was a time-range filter
-			if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range']) && is_array($filters['comp-filters'][0]['time-range'])) {
-				$timeRange = $filters['comp-filters'][0]['time-range'];
-
-				// If start time OR the end time is not specified, we can do a
-				// 100% accurate mysql query.
-				if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
-					$requirePostFilter = false;
-				}
-			}
-		}
-		$columns = ['uri'];
-		if ($requirePostFilter) {
-			$columns = ['uri', 'calendardata'];
-		}
-		$query = $this->db->getQueryBuilder();
-		$query->select($columns)
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-
-		if ($componentType) {
-			$query->andWhere($query->expr()->eq('componenttype', $query->createNamedParameter($componentType)));
-		}
-
-		if ($timeRange && $timeRange['start']) {
-			$query->andWhere($query->expr()->gt('lastoccurence', $query->createNamedParameter($timeRange['start']->getTimeStamp())));
-		}
-		if ($timeRange && $timeRange['end']) {
-			$query->andWhere($query->expr()->lt('firstoccurence', $query->createNamedParameter($timeRange['end']->getTimeStamp())));
-		}
-
-		$stmt = $query->executeQuery();
-
-		$result = [];
-		while ($row = $stmt->fetch()) {
-			if ($requirePostFilter) {
-				// validateFilterForObject will parse the calendar data
-				// catch parsing errors
-				try {
-					$matches = $this->validateFilterForObject($row, $filters);
-				} catch (ParseException $ex) {
-					$this->logger->logException($ex, [
-						'app' => 'dav',
-						'message' => 'Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri']
-					]);
-					continue;
-				} catch (InvalidDataException $ex) {
-					$this->logger->logException($ex, [
-						'app' => 'dav',
-						'message' => 'Caught invalid data exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri']
-					]);
-					continue;
-				}
-
-				if (!$matches) {
-					continue;
-				}
-			}
-			$result[] = $row['uri'];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * custom Nextcloud search extension for CalDAV
-	 *
-	 * TODO - this should optionally cover cached calendar objects as well
-	 *
-	 * @param string $principalUri
-	 * @param array $filters
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 * @return array
-	 */
-	public function calendarSearch($principalUri, array $filters, $limit = null, $offset = null) {
-		$calendars = $this->getCalendarsForUser($principalUri);
-		$ownCalendars = [];
-		$sharedCalendars = [];
-
-		$uriMapper = [];
-
-		foreach ($calendars as $calendar) {
-			if ($calendar['{http://owncloud.org/ns}owner-principal'] === $principalUri) {
-				$ownCalendars[] = $calendar['id'];
-			} else {
-				$sharedCalendars[] = $calendar['id'];
-			}
-			$uriMapper[$calendar['id']] = $calendar['uri'];
-		}
-		if (count($ownCalendars) === 0 && count($sharedCalendars) === 0) {
-			return [];
-		}
-
-		$query = $this->db->getQueryBuilder();
-		// Calendar id expressions
-		$calendarExpressions = [];
-		foreach ($ownCalendars as $id) {
-			$calendarExpressions[] = $query->expr()->andX(
-				$query->expr()->eq('c.calendarid',
-					$query->createNamedParameter($id)),
-				$query->expr()->eq('c.calendartype',
-						$query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
-		}
-		foreach ($sharedCalendars as $id) {
-			$calendarExpressions[] = $query->expr()->andX(
-				$query->expr()->eq('c.calendarid',
-					$query->createNamedParameter($id)),
-				$query->expr()->eq('c.classification',
-					$query->createNamedParameter(self::CLASSIFICATION_PUBLIC)),
-				$query->expr()->eq('c.calendartype',
-					$query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
-		}
-
-		if (count($calendarExpressions) === 1) {
-			$calExpr = $calendarExpressions[0];
-		} else {
-			$calExpr = call_user_func_array([$query->expr(), 'orX'], $calendarExpressions);
-		}
-
-		// Component expressions
-		$compExpressions = [];
-		foreach ($filters['comps'] as $comp) {
-			$compExpressions[] = $query->expr()
-				->eq('c.componenttype', $query->createNamedParameter($comp));
-		}
-
-		if (count($compExpressions) === 1) {
-			$compExpr = $compExpressions[0];
-		} else {
-			$compExpr = call_user_func_array([$query->expr(), 'orX'], $compExpressions);
-		}
-
-		if (!isset($filters['props'])) {
-			$filters['props'] = [];
-		}
-		if (!isset($filters['params'])) {
-			$filters['params'] = [];
-		}
-
-		$propParamExpressions = [];
-		foreach ($filters['props'] as $prop) {
-			$propParamExpressions[] = $query->expr()->andX(
-				$query->expr()->eq('i.name', $query->createNamedParameter($prop)),
-				$query->expr()->isNull('i.parameter')
-			);
-		}
-		foreach ($filters['params'] as $param) {
-			$propParamExpressions[] = $query->expr()->andX(
-				$query->expr()->eq('i.name', $query->createNamedParameter($param['property'])),
-				$query->expr()->eq('i.parameter', $query->createNamedParameter($param['parameter']))
-			);
-		}
-
-		if (count($propParamExpressions) === 1) {
-			$propParamExpr = $propParamExpressions[0];
-		} else {
-			$propParamExpr = call_user_func_array([$query->expr(), 'orX'], $propParamExpressions);
-		}
-
-		$query->select(['c.calendarid', 'c.uri'])
-			->from($this->dbObjectPropertiesTable, 'i')
-			->join('i', 'calendarobjects', 'c', $query->expr()->eq('i.objectid', 'c.id'))
-			->where($calExpr)
-			->andWhere($compExpr)
-			->andWhere($propParamExpr)
-			->andWhere($query->expr()->iLike('i.value',
-				$query->createNamedParameter('%'.$this->db->escapeLikeParameter($filters['search-term']).'%')));
-
-		if ($offset) {
-			$query->setFirstResult($offset);
-		}
-		if ($limit) {
-			$query->setMaxResults($limit);
-		}
-
-		$stmt = $query->executeQuery();
-
-		$result = [];
-		while ($row = $stmt->fetch()) {
-			$path = $uriMapper[$row['calendarid']] . '/' . $row['uri'];
-			if (!in_array($path, $result)) {
-				$result[] = $path;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * used for Nextcloud's calendar API
-	 *
-	 * @param array $calendarInfo
-	 * @param string $pattern
-	 * @param array $searchProperties
-	 * @param array $options
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 *
-	 * @return array
-	 */
-	public function search(array $calendarInfo, $pattern, array $searchProperties,
-						   array $options, $limit, $offset) {
-		$outerQuery = $this->db->getQueryBuilder();
-		$innerQuery = $this->db->getQueryBuilder();
-
-		$innerQuery->selectDistinct('op.objectid')
-			->from($this->dbObjectPropertiesTable, 'op')
-			->andWhere($innerQuery->expr()->eq('op.calendarid',
-				$outerQuery->createNamedParameter($calendarInfo['id'])))
-			->andWhere($innerQuery->expr()->eq('op.calendartype',
-				$outerQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
-
-		// only return public items for shared calendars for now
-		if ($calendarInfo['principaluri'] !== $calendarInfo['{http://owncloud.org/ns}owner-principal']) {
-			$innerQuery->andWhere($innerQuery->expr()->eq('c.classification',
-				$outerQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
-		}
-
-		$or = $innerQuery->expr()->orX();
-		foreach ($searchProperties as $searchProperty) {
-			$or->add($innerQuery->expr()->eq('op.name',
-				$outerQuery->createNamedParameter($searchProperty)));
-		}
-		$innerQuery->andWhere($or);
-
-		if ($pattern !== '') {
-			$innerQuery->andWhere($innerQuery->expr()->iLike('op.value',
-				$outerQuery->createNamedParameter('%' .
-					$this->db->escapeLikeParameter($pattern) . '%')));
-		}
-
-		$outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri')
-			->from('calendarobjects', 'c');
-
-		if (isset($options['timerange'])) {
-			if (isset($options['timerange']['start']) && $options['timerange']['start'] instanceof DateTime) {
-				$outerQuery->andWhere($outerQuery->expr()->gt('lastoccurence',
-					$outerQuery->createNamedParameter($options['timerange']['start']->getTimeStamp())));
-			}
-			if (isset($options['timerange']['end']) && $options['timerange']['end'] instanceof DateTime) {
-				$outerQuery->andWhere($outerQuery->expr()->lt('firstoccurence',
-					$outerQuery->createNamedParameter($options['timerange']['end']->getTimeStamp())));
-			}
-		}
-
-		if (isset($options['types'])) {
-			$or = $outerQuery->expr()->orX();
-			foreach ($options['types'] as $type) {
-				$or->add($outerQuery->expr()->eq('componenttype',
-					$outerQuery->createNamedParameter($type)));
-			}
-			$outerQuery->andWhere($or);
-		}
-
-		$outerQuery->andWhere($outerQuery->expr()->in('c.id',
-			$outerQuery->createFunction($innerQuery->getSQL())));
-
-		if ($offset) {
-			$outerQuery->setFirstResult($offset);
-		}
-		if ($limit) {
-			$outerQuery->setMaxResults($limit);
-		}
-
-		$result = $outerQuery->executeQuery();
-		$calendarObjects = $result->fetchAll();
-
-		return array_map(function ($o) {
-			$calendarData = Reader::read($o['calendardata']);
-			$comps = $calendarData->getComponents();
-			$objects = [];
-			$timezones = [];
-			foreach ($comps as $comp) {
-				if ($comp instanceof VTimeZone) {
-					$timezones[] = $comp;
-				} else {
-					$objects[] = $comp;
-				}
-			}
-
-			return [
-				'id' => $o['id'],
-				'type' => $o['componenttype'],
-				'uid' => $o['uid'],
-				'uri' => $o['uri'],
-				'objects' => array_map(function ($c) {
-					return $this->transformSearchData($c);
-				}, $objects),
-				'timezones' => array_map(function ($c) {
-					return $this->transformSearchData($c);
-				}, $timezones),
-			];
-		}, $calendarObjects);
-	}
-
-	/**
-	 * @param Component $comp
-	 * @return array
-	 */
-	private function transformSearchData(Component $comp) {
-		$data = [];
-		/** @var Component[] $subComponents */
-		$subComponents = $comp->getComponents();
-		/** @var Property[] $properties */
-		$properties = array_filter($comp->children(), function ($c) {
-			return $c instanceof Property;
-		});
-		$validationRules = $comp->getValidationRules();
-
-		foreach ($subComponents as $subComponent) {
-			$name = $subComponent->name;
-			if (!isset($data[$name])) {
-				$data[$name] = [];
-			}
-			$data[$name][] = $this->transformSearchData($subComponent);
-		}
-
-		foreach ($properties as $property) {
-			$name = $property->name;
-			if (!isset($validationRules[$name])) {
-				$validationRules[$name] = '*';
-			}
-
-			$rule = $validationRules[$property->name];
-			if ($rule === '+' || $rule === '*') { // multiple
-				if (!isset($data[$name])) {
-					$data[$name] = [];
-				}
-
-				$data[$name][] = $this->transformSearchProperty($property);
-			} else { // once
-				$data[$name] = $this->transformSearchProperty($property);
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * @param Property $prop
-	 * @return array
-	 */
-	private function transformSearchProperty(Property $prop) {
-		// No need to check Date, as it extends DateTime
-		if ($prop instanceof Property\ICalendar\DateTime) {
-			$value = $prop->getDateTime();
-		} else {
-			$value = $prop->getValue();
-		}
-
-		return [
-			$value,
-			$prop->parameters()
-		];
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $pattern
-	 * @param array $componentTypes
-	 * @param array $searchProperties
-	 * @param array $searchParameters
-	 * @param array $options
-	 * @return array
-	 */
-	public function searchPrincipalUri(string $principalUri,
-									   string $pattern,
-									   array $componentTypes,
-									   array $searchProperties,
-									   array $searchParameters,
-									   array $options = []): array {
-		$escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
-
-		$calendarObjectIdQuery = $this->db->getQueryBuilder();
-		$calendarOr = $calendarObjectIdQuery->expr()->orX();
-		$searchOr = $calendarObjectIdQuery->expr()->orX();
-
-		// Fetch calendars and subscription
-		$calendars = $this->getCalendarsForUser($principalUri);
-		$subscriptions = $this->getSubscriptionsForUser($principalUri);
-		foreach ($calendars as $calendar) {
-			$calendarAnd = $calendarObjectIdQuery->expr()->andX();
-			$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$calendar['id'])));
-			$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
-
-			// If it's shared, limit search to public events
-			if (isset($calendar['{http://owncloud.org/ns}owner-principal'])
-				&& $calendar['principaluri'] !== $calendar['{http://owncloud.org/ns}owner-principal']) {
-				$calendarAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
-			}
-
-			$calendarOr->add($calendarAnd);
-		}
-		foreach ($subscriptions as $subscription) {
-			$subscriptionAnd = $calendarObjectIdQuery->expr()->andX();
-			$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$subscription['id'])));
-			$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
-
-			// If it's shared, limit search to public events
-			if (isset($subscription['{http://owncloud.org/ns}owner-principal'])
-				&& $subscription['principaluri'] !== $subscription['{http://owncloud.org/ns}owner-principal']) {
-				$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
-			}
-
-			$calendarOr->add($subscriptionAnd);
-		}
-
-		foreach ($searchProperties as $property) {
-			$propertyAnd = $calendarObjectIdQuery->expr()->andX();
-			$propertyAnd->add($calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)));
-			$propertyAnd->add($calendarObjectIdQuery->expr()->isNull('cob.parameter'));
-
-			$searchOr->add($propertyAnd);
-		}
-		foreach ($searchParameters as $property => $parameter) {
-			$parameterAnd = $calendarObjectIdQuery->expr()->andX();
-			$parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)));
-			$parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.parameter', $calendarObjectIdQuery->createNamedParameter($parameter, IQueryBuilder::PARAM_STR_ARRAY)));
-
-			$searchOr->add($parameterAnd);
-		}
-
-		if ($calendarOr->count() === 0) {
-			return [];
-		}
-		if ($searchOr->count() === 0) {
-			return [];
-		}
-
-		$calendarObjectIdQuery->selectDistinct('cob.objectid')
-			->from($this->dbObjectPropertiesTable, 'cob')
-			->leftJoin('cob', 'calendarobjects', 'co', $calendarObjectIdQuery->expr()->eq('co.id', 'cob.objectid'))
-			->andWhere($calendarObjectIdQuery->expr()->in('co.componenttype', $calendarObjectIdQuery->createNamedParameter($componentTypes, IQueryBuilder::PARAM_STR_ARRAY)))
-			->andWhere($calendarOr)
-			->andWhere($searchOr);
-
-		if ('' !== $pattern) {
-			if (!$escapePattern) {
-				$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->ilike('cob.value', $calendarObjectIdQuery->createNamedParameter($pattern)));
-			} else {
-				$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->ilike('cob.value', $calendarObjectIdQuery->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
-			}
-		}
-
-		if (isset($options['limit'])) {
-			$calendarObjectIdQuery->setMaxResults($options['limit']);
-		}
-		if (isset($options['offset'])) {
-			$calendarObjectIdQuery->setFirstResult($options['offset']);
-		}
-
-		$result = $calendarObjectIdQuery->executeQuery();
-		$matches = $result->fetchAll();
-		$result->closeCursor();
-		$matches = array_map(static function (array $match):int {
-			return (int) $match['objectid'];
-		}, $matches);
-
-		$query = $this->db->getQueryBuilder();
-		$query->select('calendardata', 'uri', 'calendarid', 'calendartype')
-			->from('calendarobjects')
-			->where($query->expr()->in('id', $query->createNamedParameter($matches, IQueryBuilder::PARAM_INT_ARRAY)));
-
-		$result = $query->executeQuery();
-		$calendarObjects = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_map(function (array $array): array {
-			$array['calendarid'] = (int)$array['calendarid'];
-			$array['calendartype'] = (int)$array['calendartype'];
-			$array['calendardata'] = $this->readBlob($array['calendardata']);
-
-			return $array;
-		}, $calendarObjects);
-	}
-
-	/**
-	 * Searches through all of a users calendars and calendar objects to find
-	 * an object with a specific UID.
-	 *
-	 * This method should return the path to this object, relative to the
-	 * calendar home, so this path usually only contains two parts:
-	 *
-	 * calendarpath/objectpath.ics
-	 *
-	 * If the uid is not found, return null.
-	 *
-	 * This method should only consider * objects that the principal owns, so
-	 * any calendars owned by other principals that also appear in this
-	 * collection should be ignored.
-	 *
-	 * @param string $principalUri
-	 * @param string $uid
-	 * @return string|null
-	 */
-	public function getCalendarObjectByUID($principalUri, $uid) {
-		$query = $this->db->getQueryBuilder();
-		$query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi')
-			->from('calendarobjects', 'co')
-			->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
-			->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)))
-			->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)));
-
-		$stmt = $query->executeQuery();
-		$row = $stmt->fetch();
-		$stmt->closeCursor();
-		if ($row) {
-			return $row['calendaruri'] . '/' . $row['objecturi'];
-		}
-
-		return null;
-	}
-
-	/**
-	 * The getChanges method returns all the changes that have happened, since
-	 * the specified syncToken in the specified calendar.
-	 *
-	 * This function should return an array, such as the following:
-	 *
-	 * [
-	 *   'syncToken' => 'The current synctoken',
-	 *   'added'   => [
-	 *      'new.txt',
-	 *   ],
-	 *   'modified'   => [
-	 *      'modified.txt',
-	 *   ],
-	 *   'deleted' => [
-	 *      'foo.php.bak',
-	 *      'old.txt'
-	 *   ]
-	 * );
-	 *
-	 * The returned syncToken property should reflect the *current* syncToken
-	 * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
-	 * property This is * needed here too, to ensure the operation is atomic.
-	 *
-	 * If the $syncToken argument is specified as null, this is an initial
-	 * sync, and all members should be reported.
-	 *
-	 * The modified property is an array of nodenames that have changed since
-	 * the last token.
-	 *
-	 * The deleted property is an array with nodenames, that have been deleted
-	 * from collection.
-	 *
-	 * The $syncLevel argument is basically the 'depth' of the report. If it's
-	 * 1, you only have to report changes that happened only directly in
-	 * immediate descendants. If it's 2, it should also include changes from
-	 * the nodes below the child collections. (grandchildren)
-	 *
-	 * The $limit argument allows a client to specify how many results should
-	 * be returned at most. If the limit is not specified, it should be treated
-	 * as infinite.
-	 *
-	 * If the limit (infinite or not) is higher than you're willing to return,
-	 * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
-	 *
-	 * If the syncToken is expired (due to data cleanup) or unknown, you must
-	 * return null.
-	 *
-	 * The limit is 'suggestive'. You are free to ignore it.
-	 *
-	 * @param string $calendarId
-	 * @param string $syncToken
-	 * @param int $syncLevel
-	 * @param int|null $limit
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		// Current synctoken
-		$qb = $this->db->getQueryBuilder();
-		$qb->select('synctoken')
-			->from('calendars')
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($calendarId))
-			);
-		$stmt = $qb->executeQuery();
-		$currentToken = $stmt->fetchOne();
-
-		if ($currentToken === false) {
-			return null;
-		}
-
-		$result = [
-			'syncToken' => $currentToken,
-			'added' => [],
-			'modified' => [],
-			'deleted' => [],
-		];
-
-		if ($syncToken) {
-			$qb = $this->db->getQueryBuilder();
-
-			$qb->select('uri', 'operation')
-				->from('calendarchanges')
-				->where(
-					$qb->expr()->andX(
-						$qb->expr()->gte('synctoken', $qb->createNamedParameter($syncToken)),
-						$qb->expr()->lt('synctoken', $qb->createNamedParameter($currentToken)),
-						$qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)),
-						$qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType))
-					)
-				)->orderBy('synctoken');
-			if (is_int($limit) && $limit > 0) {
-				$qb->setMaxResults($limit);
-			}
-
-			// Fetching all changes
-			$stmt = $qb->executeQuery();
-			$changes = [];
-
-			// This loop ensures that any duplicates are overwritten, only the
-			// last change on a node is relevant.
-			while ($row = $stmt->fetch()) {
-				$changes[$row['uri']] = $row['operation'];
-			}
-			$stmt->closeCursor();
-
-			foreach ($changes as $uri => $operation) {
-				switch ($operation) {
-					case 1:
-						$result['added'][] = $uri;
-						break;
-					case 2:
-						$result['modified'][] = $uri;
-						break;
-					case 3:
-						$result['deleted'][] = $uri;
-						break;
-				}
-			}
-		} else {
-			// No synctoken supplied, this is the initial sync.
-			$qb = $this->db->getQueryBuilder();
-			$qb->select('uri')
-				->from('calendarobjects')
-				->where(
-					$qb->expr()->andX(
-						$qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)),
-						$qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType))
-					)
-				);
-			$stmt = $qb->executeQuery();
-			$result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
-			$stmt->closeCursor();
-		}
-		return $result;
-	}
-
-	/**
-	 * Returns a list of subscriptions for a principal.
-	 *
-	 * Every subscription is an array with the following keys:
-	 *  * id, a unique id that will be used by other functions to modify the
-	 *    subscription. This can be the same as the uri or a database key.
-	 *  * uri. This is just the 'base uri' or 'filename' of the subscription.
-	 *  * principaluri. The owner of the subscription. Almost always the same as
-	 *    principalUri passed to this method.
-	 *
-	 * Furthermore, all the subscription info must be returned too:
-	 *
-	 * 1. {DAV:}displayname
-	 * 2. {http://apple.com/ns/ical/}refreshrate
-	 * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
-	 *    should not be stripped).
-	 * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
-	 *    should not be stripped).
-	 * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
-	 *    attachments should not be stripped).
-	 * 6. {http://calendarserver.org/ns/}source (Must be a
-	 *     Sabre\DAV\Property\Href).
-	 * 7. {http://apple.com/ns/ical/}calendar-color
-	 * 8. {http://apple.com/ns/ical/}calendar-order
-	 * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-	 *    (should just be an instance of
-	 *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
-	 *    default components).
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	public function getSubscriptionsForUser($principalUri) {
-		$fields = array_values($this->subscriptionPropertyMap);
-		$fields[] = 'id';
-		$fields[] = 'uri';
-		$fields[] = 'source';
-		$fields[] = 'principaluri';
-		$fields[] = 'lastmodified';
-		$fields[] = 'synctoken';
-
-		$query = $this->db->getQueryBuilder();
-		$query->select($fields)
-			->from('calendarsubscriptions')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->orderBy('calendarorder', 'asc');
-		$stmt = $query->executeQuery();
-
-		$subscriptions = [];
-		while ($row = $stmt->fetch()) {
-			$subscription = [
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => $row['principaluri'],
-				'source' => $row['source'],
-				'lastmodified' => $row['lastmodified'],
-
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
-			];
-
-			foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
-				if (!is_null($row[$dbName])) {
-					$subscription[$xmlName] = $row[$dbName];
-				}
-			}
-
-			$subscriptions[] = $subscription;
-		}
-
-		return $subscriptions;
-	}
-
-	/**
-	 * Creates a new subscription for a principal.
-	 *
-	 * If the creation was a success, an id must be returned that can be used to reference
-	 * this subscription in other methods, such as updateSubscription.
-	 *
-	 * @param string $principalUri
-	 * @param string $uri
-	 * @param array $properties
-	 * @return mixed
-	 */
-	public function createSubscription($principalUri, $uri, array $properties) {
-		if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
-			throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
-		}
-
-		$values = [
-			'principaluri' => $principalUri,
-			'uri' => $uri,
-			'source' => $properties['{http://calendarserver.org/ns/}source']->getHref(),
-			'lastmodified' => time(),
-		];
-
-		$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
-
-		foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
-			if (array_key_exists($xmlName, $properties)) {
-				$values[$dbName] = $properties[$xmlName];
-				if (in_array($dbName, $propertiesBoolean)) {
-					$values[$dbName] = true;
-				}
-			}
-		}
-
-		$valuesToInsert = [];
-
-		$query = $this->db->getQueryBuilder();
-
-		foreach (array_keys($values) as $name) {
-			$valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
-		}
-
-		$query->insert('calendarsubscriptions')
-			->values($valuesToInsert)
-			->executeStatement();
-
-		$subscriptionId = $query->getLastInsertId();
-
-		$subscriptionRow = $this->getSubscriptionById($subscriptionId);
-		$this->dispatcher->dispatchTyped(new SubscriptionCreatedEvent($subscriptionId, $subscriptionRow));
-		$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createSubscription', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-			[
-				'subscriptionId' => $subscriptionId,
-				'subscriptionData' => $subscriptionRow,
-			]));
-
-		return $subscriptionId;
-	}
-
-	/**
-	 * Updates a subscription
-	 *
-	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-	 * To do the actual updates, you must tell this object which properties
-	 * you're going to process with the handle() method.
-	 *
-	 * Calling the handle method is like telling the PropPatch object "I
-	 * promise I can handle updating this property".
-	 *
-	 * Read the PropPatch documentation for more info and examples.
-	 *
-	 * @param mixed $subscriptionId
-	 * @param PropPatch $propPatch
-	 * @return void
-	 */
-	public function updateSubscription($subscriptionId, PropPatch $propPatch) {
-		$supportedProperties = array_keys($this->subscriptionPropertyMap);
-		$supportedProperties[] = '{http://calendarserver.org/ns/}source';
-
-		$propPatch->handle($supportedProperties, function ($mutations) use ($subscriptionId) {
-			$newValues = [];
-
-			foreach ($mutations as $propertyName => $propertyValue) {
-				if ($propertyName === '{http://calendarserver.org/ns/}source') {
-					$newValues['source'] = $propertyValue->getHref();
-				} else {
-					$fieldName = $this->subscriptionPropertyMap[$propertyName];
-					$newValues[$fieldName] = $propertyValue;
-				}
-			}
-
-			$query = $this->db->getQueryBuilder();
-			$query->update('calendarsubscriptions')
-				->set('lastmodified', $query->createNamedParameter(time()));
-			foreach ($newValues as $fieldName => $value) {
-				$query->set($fieldName, $query->createNamedParameter($value));
-			}
-			$query->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
-				->executeStatement();
-
-			$subscriptionRow = $this->getSubscriptionById($subscriptionId);
-			$this->dispatcher->dispatchTyped(new SubscriptionUpdatedEvent((int)$subscriptionId, $subscriptionRow, [], $mutations));
-			$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateSubscription', new GenericEvent(
-				'\OCA\DAV\CalDAV\CalDavBackend::updateSubscription',
-				[
-					'subscriptionId' => $subscriptionId,
-					'subscriptionData' => $subscriptionRow,
-					'propertyMutations' => $mutations,
-				]));
-
-			return true;
-		});
-	}
-
-	/**
-	 * Deletes a subscription.
-	 *
-	 * @param mixed $subscriptionId
-	 * @return void
-	 */
-	public function deleteSubscription($subscriptionId) {
-		$subscriptionRow = $this->getSubscriptionById($subscriptionId);
-
-		$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-			[
-				'subscriptionId' => $subscriptionId,
-				'subscriptionData' => $this->getSubscriptionById($subscriptionId),
-			]));
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendarsubscriptions')
-			->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
-			->executeStatement();
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->executeStatement();
-
-		$query->delete('calendarchanges')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->executeStatement();
-
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->executeStatement();
-
-		if ($subscriptionRow) {
-			$this->dispatcher->dispatchTyped(new SubscriptionDeletedEvent((int)$subscriptionId, $subscriptionRow, []));
-		}
-	}
-
-	/**
-	 * Returns a single scheduling object for the inbox collection.
-	 *
-	 * The returned array should contain the following elements:
-	 *   * uri - A unique basename for the object. This will be used to
-	 *           construct a full uri.
-	 *   * calendardata - The iCalendar object
-	 *   * lastmodified - The last modification date. Can be an int for a unix
-	 *                    timestamp, or a PHP DateTime object.
-	 *   * etag - A unique token that must change if the object changed.
-	 *   * size - The size of the object, in bytes.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @return array
-	 */
-	public function getSchedulingObject($principalUri, $objectUri) {
-		$query = $this->db->getQueryBuilder();
-		$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
-			->from('schedulingobjects')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-			->executeQuery();
-
-		$row = $stmt->fetch();
-
-		if (!$row) {
-			return null;
-		}
-
-		return [
-			'uri' => $row['uri'],
-			'calendardata' => $row['calendardata'],
-			'lastmodified' => $row['lastmodified'],
-			'etag' => '"' . $row['etag'] . '"',
-			'size' => (int)$row['size'],
-		];
-	}
-
-	/**
-	 * Returns all scheduling objects for the inbox collection.
-	 *
-	 * These objects should be returned as an array. Every item in the array
-	 * should follow the same structure as returned from getSchedulingObject.
-	 *
-	 * The main difference is that 'calendardata' is optional.
-	 *
-	 * @param string $principalUri
-	 * @return array
-	 */
-	public function getSchedulingObjects($principalUri) {
-		$query = $this->db->getQueryBuilder();
-		$stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
-				->from('schedulingobjects')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->executeQuery();
-
-		$result = [];
-		foreach ($stmt->fetchAll() as $row) {
-			$result[] = [
-				'calendardata' => $row['calendardata'],
-				'uri' => $row['uri'],
-				'lastmodified' => $row['lastmodified'],
-				'etag' => '"' . $row['etag'] . '"',
-				'size' => (int)$row['size'],
-			];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Deletes a scheduling object from the inbox collection.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @return void
-	 */
-	public function deleteSchedulingObject($principalUri, $objectUri) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('schedulingobjects')
-				->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
-				->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
-				->executeStatement();
-	}
-
-	/**
-	 * Creates a new scheduling object. This should land in a users' inbox.
-	 *
-	 * @param string $principalUri
-	 * @param string $objectUri
-	 * @param string $objectData
-	 * @return void
-	 */
-	public function createSchedulingObject($principalUri, $objectUri, $objectData) {
-		$query = $this->db->getQueryBuilder();
-		$query->insert('schedulingobjects')
-			->values([
-				'principaluri' => $query->createNamedParameter($principalUri),
-				'calendardata' => $query->createNamedParameter($objectData, IQueryBuilder::PARAM_LOB),
-				'uri' => $query->createNamedParameter($objectUri),
-				'lastmodified' => $query->createNamedParameter(time()),
-				'etag' => $query->createNamedParameter(md5($objectData)),
-				'size' => $query->createNamedParameter(strlen($objectData))
-			])
-			->executeStatement();
-	}
-
-	/**
-	 * Adds a change record to the calendarchanges table.
-	 *
-	 * @param mixed $calendarId
-	 * @param string $objectUri
-	 * @param int $operation 1 = add, 2 = modify, 3 = delete.
-	 * @param int $calendarType
-	 * @return void
-	 */
-	protected function addChange($calendarId, $objectUri, $operation, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
-
-		$query = $this->db->getQueryBuilder();
-		$query->select('synctoken')
-			->from($table)
-			->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
-		$result = $query->executeQuery();
-		$syncToken = (int)$result->fetchOne();
-		$result->closeCursor();
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendarchanges')
-			->values([
-				'uri' => $query->createNamedParameter($objectUri),
-				'synctoken' => $query->createNamedParameter($syncToken),
-				'calendarid' => $query->createNamedParameter($calendarId),
-				'operation' => $query->createNamedParameter($operation),
-				'calendartype' => $query->createNamedParameter($calendarType),
-			])
-			->executeStatement();
-
-		$stmt = $this->db->prepare("UPDATE `*PREFIX*$table` SET `synctoken` = `synctoken` + 1 WHERE `id` = ?");
-		$stmt->execute([
-			$calendarId
-		]);
-	}
-
-	/**
-	 * Parses some information from calendar objects, used for optimized
-	 * calendar-queries.
-	 *
-	 * Returns an array with the following keys:
-	 *   * etag - An md5 checksum of the object without the quotes.
-	 *   * size - Size of the object in bytes
-	 *   * componentType - VEVENT, VTODO or VJOURNAL
-	 *   * firstOccurence
-	 *   * lastOccurence
-	 *   * uid - value of the UID property
-	 *
-	 * @param string $calendarData
-	 * @return array
-	 */
-	public function getDenormalizedData($calendarData) {
-		$vObject = Reader::read($calendarData);
-		$vEvents = [];
-		$componentType = null;
-		$component = null;
-		$firstOccurrence = null;
-		$lastOccurrence = null;
-		$uid = null;
-		$classification = self::CLASSIFICATION_PUBLIC;
-		$hasDTSTART = false;
-		foreach ($vObject->getComponents() as $component) {
-			if ($component->name !== 'VTIMEZONE') {
-				// Finding all VEVENTs, and track them
-				if ($component->name === 'VEVENT') {
-					array_push($vEvents, $component);
-					if ($component->DTSTART) {
-						$hasDTSTART = true;
-					}
-				}
-				// Track first component type and uid
-				if ($uid === null) {
-					$componentType = $component->name;
-					$uid = (string)$component->UID;
-				}
-			}
-		}
-		if (!$componentType) {
-			throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
-		}
-
-		if ($hasDTSTART) {
-			$component = $vEvents[0];
-
-			// Finding the last occurrence is a bit harder
-			if (!isset($component->RRULE) && count($vEvents) === 1) {
-				$firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
-				if (isset($component->DTEND)) {
-					$lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
-				} elseif (isset($component->DURATION)) {
-					$endDate = clone $component->DTSTART->getDateTime();
-					$endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
-					$lastOccurrence = $endDate->getTimeStamp();
-				} elseif (!$component->DTSTART->hasTime()) {
-					$endDate = clone $component->DTSTART->getDateTime();
-					$endDate->modify('+1 day');
-					$lastOccurrence = $endDate->getTimeStamp();
-				} else {
-					$lastOccurrence = $firstOccurrence;
-				}
-			} else {
-				$it = new EventIterator($vEvents);
-				$maxDate = new DateTime(self::MAX_DATE);
-				$firstOccurrence = $it->getDtStart()->getTimestamp();
-				if ($it->isInfinite()) {
-					$lastOccurrence = $maxDate->getTimestamp();
-				} else {
-					$end = $it->getDtEnd();
-					while ($it->valid() && $end < $maxDate) {
-						$end = $it->getDtEnd();
-						$it->next();
-					}
-					$lastOccurrence = $end->getTimestamp();
-				}
-			}
-		}
-
-		if ($component->CLASS) {
-			$classification = CalDavBackend::CLASSIFICATION_PRIVATE;
-			switch ($component->CLASS->getValue()) {
-				case 'PUBLIC':
-					$classification = CalDavBackend::CLASSIFICATION_PUBLIC;
-					break;
-				case 'CONFIDENTIAL':
-					$classification = CalDavBackend::CLASSIFICATION_CONFIDENTIAL;
-					break;
-			}
-		}
-		return [
-			'etag' => md5($calendarData),
-			'size' => strlen($calendarData),
-			'componentType' => $componentType,
-			'firstOccurence' => is_null($firstOccurrence) ? null : max(0, $firstOccurrence),
-			'lastOccurence' => $lastOccurrence,
-			'uid' => $uid,
-			'classification' => $classification
-		];
-	}
-
-	/**
-	 * @param $cardData
-	 * @return bool|string
-	 */
-	private function readBlob($cardData) {
-		if (is_resource($cardData)) {
-			return stream_get_contents($cardData);
-		}
-
-		return $cardData;
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param array $add
-	 * @param array $remove
-	 */
-	public function updateShares($shareable, $add, $remove) {
-		$calendarId = $shareable->getResourceId();
-		$calendarRow = $this->getCalendarById($calendarId);
-		$oldShares = $this->getShares($calendarId);
-
-		$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateShares', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::updateShares',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $calendarRow,
-				'shares' => $oldShares,
-				'add' => $add,
-				'remove' => $remove,
-			]));
-		$this->calendarSharingBackend->updateShares($shareable, $add, $remove);
-
-		$this->dispatcher->dispatchTyped(new CalendarShareUpdatedEvent((int)$calendarId, $calendarRow, $oldShares, $add, $remove));
-	}
-
-	/**
-	 * @param int $resourceId
-	 * @param int $calendarType
-	 * @return array
-	 */
-	public function getShares($resourceId, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		return $this->calendarSharingBackend->getShares($resourceId);
-	}
-
-	/**
-	 * @param boolean $value
-	 * @param \OCA\DAV\CalDAV\Calendar $calendar
-	 * @return string|null
-	 */
-	public function setPublishStatus($value, $calendar) {
-		$calendarId = $calendar->getResourceId();
-		$calendarData = $this->getCalendarById($calendarId);
-		$this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', new GenericEvent(
-			'\OCA\DAV\CalDAV\CalDavBackend::updateShares',
-			[
-				'calendarId' => $calendarId,
-				'calendarData' => $calendarData,
-				'public' => $value,
-			]));
-
-		$query = $this->db->getQueryBuilder();
-		if ($value) {
-			$publicUri = $this->random->generate(16, ISecureRandom::CHAR_HUMAN_READABLE);
-			$query->insert('dav_shares')
-				->values([
-					'principaluri' => $query->createNamedParameter($calendar->getPrincipalURI()),
-					'type' => $query->createNamedParameter('calendar'),
-					'access' => $query->createNamedParameter(self::ACCESS_PUBLIC),
-					'resourceid' => $query->createNamedParameter($calendar->getResourceId()),
-					'publicuri' => $query->createNamedParameter($publicUri)
-				]);
-			$query->executeStatement();
-
-			$this->dispatcher->dispatchTyped(new CalendarPublishedEvent((int)$calendarId, $calendarData, $publicUri));
-			return $publicUri;
-		}
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
-			->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)));
-		$query->executeStatement();
-
-		$this->dispatcher->dispatchTyped(new CalendarUnpublishedEvent((int)$calendarId, $calendarData));
-		return null;
-	}
-
-	/**
-	 * @param \OCA\DAV\CalDAV\Calendar $calendar
-	 * @return mixed
-	 */
-	public function getPublishStatus($calendar) {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select('publicuri')
-			->from('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
-			->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
-			->executeQuery();
-
-		$row = $result->fetch();
-		$result->closeCursor();
-		return $row ? reset($row) : false;
-	}
-
-	/**
-	 * @param int $resourceId
-	 * @param array $acl
-	 * @return array
-	 */
-	public function applyShareAcl($resourceId, $acl) {
-		return $this->calendarSharingBackend->applyShareAcl($resourceId, $acl);
-	}
-
-
-
-	/**
-	 * update properties table
-	 *
-	 * @param int $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @param int $calendarType
-	 */
-	public function updateProperties($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
-		$objectId = $this->getCalendarObjectId($calendarId, $objectUri, $calendarType);
-
-		try {
-			$vCalendar = $this->readCalendarData($calendarData);
-		} catch (\Exception $ex) {
-			return;
-		}
-
-		$this->purgeProperties($calendarId, $objectId);
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert($this->dbObjectPropertiesTable)
-			->values(
-				[
-					'calendarid' => $query->createNamedParameter($calendarId),
-					'calendartype' => $query->createNamedParameter($calendarType),
-					'objectid' => $query->createNamedParameter($objectId),
-					'name' => $query->createParameter('name'),
-					'parameter' => $query->createParameter('parameter'),
-					'value' => $query->createParameter('value'),
-				]
-			);
-
-		$indexComponents = ['VEVENT', 'VJOURNAL', 'VTODO'];
-		foreach ($vCalendar->getComponents() as $component) {
-			if (!in_array($component->name, $indexComponents)) {
-				continue;
-			}
-
-			foreach ($component->children() as $property) {
-				if (in_array($property->name, self::$indexProperties)) {
-					$value = $property->getValue();
-					// is this a shitty db?
-					if (!$this->db->supports4ByteText()) {
-						$value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
-					}
-					$value = mb_strcut($value, 0, 254);
-
-					$query->setParameter('name', $property->name);
-					$query->setParameter('parameter', null);
-					$query->setParameter('value', $value);
-					$query->executeStatement();
-				}
-
-				if (array_key_exists($property->name, self::$indexParameters)) {
-					$parameters = $property->parameters();
-					$indexedParametersForProperty = self::$indexParameters[$property->name];
-
-					foreach ($parameters as $key => $value) {
-						if (in_array($key, $indexedParametersForProperty)) {
-							// is this a shitty db?
-							if ($this->db->supports4ByteText()) {
-								$value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
-							}
-
-							$query->setParameter('name', $property->name);
-							$query->setParameter('parameter', mb_strcut($key, 0, 254));
-							$query->setParameter('value', mb_strcut($value, 0, 254));
-							$query->executeStatement();
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * deletes all birthday calendars
-	 */
-	public function deleteAllBirthdayCalendars() {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['id'])->from('calendars')
-			->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
-			->executeQuery();
-
-		$ids = $result->fetchAll();
-		foreach ($ids as $id) {
-			$this->deleteCalendar($id['id']);
-		}
-	}
-
-	/**
-	 * @param $subscriptionId
-	 */
-	public function purgeAllCachedEventsForSubscription($subscriptionId) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('uri')
-			->from('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
-		$stmt = $query->executeQuery();
-
-		$uris = [];
-		foreach ($stmt->fetchAll() as $row) {
-			$uris[] = $row['uri'];
-		}
-		$stmt->closeCursor();
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('calendarobjects')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->executeStatement();
-
-		$query->delete('calendarchanges')
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->executeStatement();
-
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
-			->executeStatement();
-
-		foreach ($uris as $uri) {
-			$this->addChange($subscriptionId, $uri, 3, self::CALENDAR_TYPE_SUBSCRIPTION);
-		}
-	}
-
-	/**
-	 * Move a calendar from one user to another
-	 *
-	 * @param string $uriName
-	 * @param string $uriOrigin
-	 * @param string $uriDestination
-	 * @param string $newUriName (optional) the new uriName
-	 */
-	public function moveCalendar($uriName, $uriOrigin, $uriDestination, $newUriName = null) {
-		$query = $this->db->getQueryBuilder();
-		$query->update('calendars')
-			->set('principaluri', $query->createNamedParameter($uriDestination))
-			->set('uri', $query->createNamedParameter($newUriName ?: $uriName))
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($uriOrigin)))
-			->andWhere($query->expr()->eq('uri', $query->createNamedParameter($uriName)))
-			->executeStatement();
-	}
-
-	/**
-	 * read VCalendar data into a VCalendar object
-	 *
-	 * @param string $objectData
-	 * @return VCalendar
-	 */
-	protected function readCalendarData($objectData) {
-		return Reader::read($objectData);
-	}
-
-	/**
-	 * delete all properties from a given calendar object
-	 *
-	 * @param int $calendarId
-	 * @param int $objectId
-	 */
-	protected function purgeProperties($calendarId, $objectId) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete($this->dbObjectPropertiesTable)
-			->where($query->expr()->eq('objectid', $query->createNamedParameter($objectId)))
-			->andWhere($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)));
-		$query->executeStatement();
-	}
-
-	/**
-	 * get ID from a given calendar object
-	 *
-	 * @param int $calendarId
-	 * @param string $uri
-	 * @param int $calendarType
-	 * @return int
-	 */
-	protected function getCalendarObjectId($calendarId, $uri, $calendarType):int {
-		$query = $this->db->getQueryBuilder();
-		$query->select('id')
-			->from('calendarobjects')
-			->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
-			->andWhere($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
-			->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
-
-		$result = $query->executeQuery();
-		$objectIds = $result->fetch();
-		$result->closeCursor();
-
-		if (!isset($objectIds['id'])) {
-			throw new \InvalidArgumentException('Calendarobject does not exists: ' . $uri);
-		}
-
-		return (int)$objectIds['id'];
-	}
-
-	/**
-	 * return legacy endpoint principal name to new principal name
-	 *
-	 * @param $principalUri
-	 * @param $toV2
-	 * @return string
-	 */
-	private function convertPrincipal($principalUri, $toV2) {
-		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
-			[, $name] = Uri\split($principalUri);
-			if ($toV2 === true) {
-				return "principals/users/$name";
-			}
-			return "principals/$name";
-		}
-		return $principalUri;
-	}
-
-	/**
-	 * adds information about an owner to the calendar data
-	 *
-	 * @param $calendarInfo
-	 */
-	private function addOwnerPrincipal(&$calendarInfo) {
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
-		if (isset($calendarInfo[$ownerPrincipalKey])) {
-			$uri = $calendarInfo[$ownerPrincipalKey];
-		} else {
-			$uri = $calendarInfo['principaluri'];
-		}
-
-		$principalInformation = $this->principalBackend->getPrincipalByPath($uri);
-		if (isset($principalInformation['{DAV:}displayname'])) {
-			$calendarInfo[$displaynameKey] = $principalInformation['{DAV:}displayname'];
-		}
-	}
+    public const CALENDAR_TYPE_CALENDAR = 0;
+    public const CALENDAR_TYPE_SUBSCRIPTION = 1;
+
+    public const PERSONAL_CALENDAR_URI = 'personal';
+    public const PERSONAL_CALENDAR_NAME = 'Personal';
+
+    public const RESOURCE_BOOKING_CALENDAR_URI = 'calendar';
+    public const RESOURCE_BOOKING_CALENDAR_NAME = 'Calendar';
+
+    /**
+     * We need to specify a max date, because we need to stop *somewhere*
+     *
+     * On 32 bit system the maximum for a signed integer is 2147483647, so
+     * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
+     * in 2038-01-19 to avoid problems when the date is converted
+     * to a unix timestamp.
+     */
+    public const MAX_DATE = '2038-01-01';
+
+    public const ACCESS_PUBLIC = 4;
+    public const CLASSIFICATION_PUBLIC = 0;
+    public const CLASSIFICATION_PRIVATE = 1;
+    public const CLASSIFICATION_CONFIDENTIAL = 2;
+
+    /**
+     * List of CalDAV properties, and how they map to database field names
+     * Add your own properties by simply adding on to this array.
+     *
+     * Note that only string-based properties are supported here.
+     *
+     * @var array
+     */
+    public $propertyMap = [
+        '{DAV:}displayname' => 'displayname',
+        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
+        '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => 'timezone',
+        '{http://apple.com/ns/ical/}calendar-order' => 'calendarorder',
+        '{http://apple.com/ns/ical/}calendar-color' => 'calendarcolor',
+    ];
+
+    /**
+     * List of subscription properties, and how they map to database field names.
+     *
+     * @var array
+     */
+    public $subscriptionPropertyMap = [
+        '{DAV:}displayname' => 'displayname',
+        '{http://apple.com/ns/ical/}refreshrate' => 'refreshrate',
+        '{http://apple.com/ns/ical/}calendar-order' => 'calendarorder',
+        '{http://apple.com/ns/ical/}calendar-color' => 'calendarcolor',
+        '{http://calendarserver.org/ns/}subscribed-strip-todos' => 'striptodos',
+        '{http://calendarserver.org/ns/}subscribed-strip-alarms' => 'stripalarms',
+        '{http://calendarserver.org/ns/}subscribed-strip-attachments' => 'stripattachments',
+    ];
+
+    /** @var array properties to index */
+    public static $indexProperties = ['CATEGORIES', 'COMMENT', 'DESCRIPTION',
+        'LOCATION', 'RESOURCES', 'STATUS', 'SUMMARY', 'ATTENDEE', 'CONTACT',
+        'ORGANIZER'];
+
+    /** @var array parameters to index */
+    public static $indexParameters = [
+        'ATTENDEE' => ['CN'],
+        'ORGANIZER' => ['CN'],
+    ];
+
+    /**
+     * @var string[] Map of uid => display name
+     */
+    protected $userDisplayNames;
+
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var Backend */
+    private $calendarSharingBackend;
+
+    /** @var Principal */
+    private $principalBackend;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ISecureRandom */
+    private $random;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IEventDispatcher */
+    private $dispatcher;
+
+    /** @var EventDispatcherInterface */
+    private $legacyDispatcher;
+
+    /** @var bool */
+    private $legacyEndpoint;
+
+    /** @var string */
+    private $dbObjectPropertiesTable = 'calendarobjects_props';
+
+    /**
+     * CalDavBackend constructor.
+     *
+     * @param IDBConnection $db
+     * @param Principal $principalBackend
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param ISecureRandom $random
+     * @param ILogger $logger
+     * @param IEventDispatcher $dispatcher
+     * @param EventDispatcherInterface $legacyDispatcher
+     * @param bool $legacyEndpoint
+     */
+    public function __construct(IDBConnection $db,
+                                Principal $principalBackend,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                ISecureRandom $random,
+                                ILogger $logger,
+                                IEventDispatcher $dispatcher,
+                                EventDispatcherInterface $legacyDispatcher,
+                                bool $legacyEndpoint = false) {
+        $this->db = $db;
+        $this->principalBackend = $principalBackend;
+        $this->userManager = $userManager;
+        $this->calendarSharingBackend = new Backend($this->db, $this->userManager, $groupManager, $principalBackend, 'calendar');
+        $this->random = $random;
+        $this->logger = $logger;
+        $this->dispatcher = $dispatcher;
+        $this->legacyDispatcher = $legacyDispatcher;
+        $this->legacyEndpoint = $legacyEndpoint;
+    }
+
+    /**
+     * Return the number of calendars for a principal
+     *
+     * By default this excludes the automatically generated birthday calendar
+     *
+     * @param $principalUri
+     * @param bool $excludeBirthday
+     * @return int
+     */
+    public function getCalendarsForUserCount($principalUri, $excludeBirthday = true) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $query = $this->db->getQueryBuilder();
+        $query->select($query->func()->count('*'))
+            ->from('calendars');
+
+        if ($principalUri === '') {
+            $query->where($query->expr()->emptyString('principaluri'));
+        } else {
+            $query->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+        }
+
+        if ($excludeBirthday) {
+            $query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
+        }
+
+        $result = $query->executeQuery();
+        $column = (int)$result->fetchOne();
+        $result->closeCursor();
+        return $column;
+    }
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri, which the basename of the uri with which the calendar is
+     *    accessed.
+     *  * principaluri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'.
+     *
+     * Many clients also require:
+     * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+     * For this property, you can just return an instance of
+     * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
+     *
+     * If you return {http://sabredav.org/ns}read-only and set the value to 1,
+     * ACL will automatically be put in read-only mode.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getCalendarsForUser($principalUri) {
+        $principalUriOriginal = $principalUri;
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)
+            ->from('calendars')
+            ->orderBy('calendarorder', 'ASC');
+
+        if ($principalUri === '') {
+            $query->where($query->expr()->emptyString('principaluri'));
+        } else {
+            $query->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)));
+        }
+
+        $result = $query->executeQuery();
+
+        $calendars = [];
+        while ($row = $result->fetch()) {
+            $row['principaluri'] = (string) $row['principaluri'];
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
+            ];
+
+            foreach ($this->propertyMap as $xmlName => $dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $this->addOwnerPrincipal($calendar);
+
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+        $result->closeCursor();
+
+        // query for shared calendars
+        $principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+        $principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
+
+        $principals[] = $principalUri;
+
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'a.id';
+        $fields[] = 'a.uri';
+        $fields[] = 'a.synctoken';
+        $fields[] = 'a.components';
+        $fields[] = 'a.principaluri';
+        $fields[] = 'a.transparent';
+        $fields[] = 's.access';
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)
+            ->from('dav_shares', 's')
+            ->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
+            ->where($query->expr()->in('s.principaluri', $query->createParameter('principaluri')))
+            ->andWhere($query->expr()->eq('s.type', $query->createParameter('type')))
+            ->setParameter('type', 'calendar')
+            ->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
+
+        $result = $query->executeQuery();
+
+        $readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+        while ($row = $result->fetch()) {
+            $row['principaluri'] = (string) $row['principaluri'];
+            if ($row['principaluri'] === $principalUri) {
+                continue;
+            }
+
+            $readOnly = (int) $row['access'] === Backend::ACCESS_READ;
+            if (isset($calendars[$row['id']])) {
+                if ($readOnly) {
+                    // New share can not have more permissions then the old one.
+                    continue;
+                }
+                if (isset($calendars[$row['id']][$readOnlyPropertyName]) &&
+                    $calendars[$row['id']][$readOnlyPropertyName] === 0) {
+                    // Old share is already read-write, no more permissions can be gained
+                    continue;
+                }
+            }
+
+            [, $name] = Uri\split($row['principaluri']);
+            $uri = $row['uri'] . '_shared_by_' . $name;
+            $row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $uri,
+                'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                $readOnlyPropertyName => $readOnly,
+            ];
+
+            foreach ($this->propertyMap as $xmlName => $dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $this->addOwnerPrincipal($calendar);
+
+            $calendars[$calendar['id']] = $calendar;
+        }
+        $result->closeCursor();
+
+        return array_values($calendars);
+    }
+
+    /**
+     * @param $principalUri
+     * @return array
+     */
+    public function getUsersOwnCalendars($principalUri) {
+        $principalUri = $this->convertPrincipal($principalUri, true);
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)->from('calendars')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+            ->orderBy('calendarorder', 'ASC');
+        $stmt = $query->executeQuery();
+        $calendars = [];
+        while ($row = $stmt->fetch()) {
+            $row['principaluri'] = (string) $row['principaluri'];
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+            ];
+            foreach ($this->propertyMap as $xmlName => $dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $this->addOwnerPrincipal($calendar);
+
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+        $stmt->closeCursor();
+        return array_values($calendars);
+    }
+
+
+    /**
+     * @param $uid
+     * @return string
+     */
+    private function getUserDisplayName($uid) {
+        if (!isset($this->userDisplayNames[$uid])) {
+            $user = $this->userManager->get($uid);
+
+            if ($user instanceof IUser) {
+                $this->userDisplayNames[$uid] = $user->getDisplayName();
+            } else {
+                $this->userDisplayNames[$uid] = $uid;
+            }
+        }
+
+        return $this->userDisplayNames[$uid];
+    }
+
+    /**
+     * @return array
+     */
+    public function getPublicCalendars() {
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'a.id';
+        $fields[] = 'a.uri';
+        $fields[] = 'a.synctoken';
+        $fields[] = 'a.components';
+        $fields[] = 'a.principaluri';
+        $fields[] = 'a.transparent';
+        $fields[] = 's.access';
+        $fields[] = 's.publicuri';
+        $calendars = [];
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select($fields)
+            ->from('dav_shares', 's')
+            ->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
+            ->where($query->expr()->in('s.access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
+            ->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
+            ->executeQuery();
+
+        while ($row = $result->fetch()) {
+            $row['principaluri'] = (string) $row['principaluri'];
+            [, $name] = Uri\split($row['principaluri']);
+            $row['displayname'] = $row['displayname'] . "($name)";
+            $components = [];
+            if ($row['components']) {
+                $components = explode(',',$row['components']);
+            }
+            $calendar = [
+                'id' => $row['id'],
+                'uri' => $row['publicuri'],
+                'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+                '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+                '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
+                '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+            ];
+
+            foreach ($this->propertyMap as $xmlName => $dbName) {
+                $calendar[$xmlName] = $row[$dbName];
+            }
+
+            $this->addOwnerPrincipal($calendar);
+
+            if (!isset($calendars[$calendar['id']])) {
+                $calendars[$calendar['id']] = $calendar;
+            }
+        }
+        $result->closeCursor();
+
+        return array_values($calendars);
+    }
+
+    /**
+     * @param string $uri
+     * @return array
+     * @throws NotFound
+     */
+    public function getPublicCalendar($uri) {
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'a.id';
+        $fields[] = 'a.uri';
+        $fields[] = 'a.synctoken';
+        $fields[] = 'a.components';
+        $fields[] = 'a.principaluri';
+        $fields[] = 'a.transparent';
+        $fields[] = 's.access';
+        $fields[] = 's.publicuri';
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select($fields)
+            ->from('dav_shares', 's')
+            ->join('s', 'calendars', 'a', $query->expr()->eq('s.resourceid', 'a.id'))
+            ->where($query->expr()->in('s.access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
+            ->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
+            ->andWhere($query->expr()->eq('s.publicuri', $query->createNamedParameter($uri)))
+            ->executeQuery();
+
+        $row = $result->fetch();
+
+        $result->closeCursor();
+
+        if ($row === false) {
+            throw new NotFound('Node with name \'' . $uri . '\' could not be found');
+        }
+
+        $row['principaluri'] = (string) $row['principaluri'];
+        [, $name] = Uri\split($row['principaluri']);
+        $row['displayname'] = $row['displayname'] . ' ' . "($name)";
+        $components = [];
+        if ($row['components']) {
+            $components = explode(',',$row['components']);
+        }
+        $calendar = [
+            'id' => $row['id'],
+            'uri' => $row['publicuri'],
+            'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+            '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+            '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+            '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+            '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+            '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
+            '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
+        ];
+
+        foreach ($this->propertyMap as $xmlName => $dbName) {
+            $calendar[$xmlName] = $row[$dbName];
+        }
+
+        $this->addOwnerPrincipal($calendar);
+
+        return $calendar;
+    }
+
+    /**
+     * @param string $principal
+     * @param string $uri
+     * @return array|null
+     */
+    public function getCalendarByUri($principal, $uri) {
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)->from('calendars')
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
+            ->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($principal)))
+            ->setMaxResults(1);
+        $stmt = $query->executeQuery();
+
+        $row = $stmt->fetch();
+        $stmt->closeCursor();
+        if ($row === false) {
+            return null;
+        }
+
+        $row['principaluri'] = (string) $row['principaluri'];
+        $components = [];
+        if ($row['components']) {
+            $components = explode(',',$row['components']);
+        }
+
+        $calendar = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+            '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+            '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+            '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+        ];
+
+        foreach ($this->propertyMap as $xmlName => $dbName) {
+            $calendar[$xmlName] = $row[$dbName];
+        }
+
+        $this->addOwnerPrincipal($calendar);
+
+        return $calendar;
+    }
+
+    /**
+     * @param $calendarId
+     * @return array|null
+     */
+    public function getCalendarById($calendarId) {
+        $fields = array_values($this->propertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'synctoken';
+        $fields[] = 'components';
+        $fields[] = 'principaluri';
+        $fields[] = 'transparent';
+
+        // Making fields a comma-delimited list
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)->from('calendars')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)))
+            ->setMaxResults(1);
+        $stmt = $query->executeQuery();
+
+        $row = $stmt->fetch();
+        $stmt->closeCursor();
+        if ($row === false) {
+            return null;
+        }
+
+        $row['principaluri'] = (string) $row['principaluri'];
+        $components = [];
+        if ($row['components']) {
+            $components = explode(',',$row['components']);
+        }
+
+        $calendar = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
+            '{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+            '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
+            '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
+        ];
+
+        foreach ($this->propertyMap as $xmlName => $dbName) {
+            $calendar[$xmlName] = $row[$dbName];
+        }
+
+        $this->addOwnerPrincipal($calendar);
+
+        return $calendar;
+    }
+
+    /**
+     * @param $subscriptionId
+     */
+    public function getSubscriptionById($subscriptionId) {
+        $fields = array_values($this->subscriptionPropertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'source';
+        $fields[] = 'synctoken';
+        $fields[] = 'principaluri';
+        $fields[] = 'lastmodified';
+
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)
+            ->from('calendarsubscriptions')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
+            ->orderBy('calendarorder', 'asc');
+        $stmt = $query->executeQuery();
+
+        $row = $stmt->fetch();
+        $stmt->closeCursor();
+        if ($row === false) {
+            return null;
+        }
+
+        $row['principaluri'] = (string) $row['principaluri'];
+        $subscription = [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'principaluri' => $row['principaluri'],
+            'source' => $row['source'],
+            'lastmodified' => $row['lastmodified'],
+            '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+            '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+        ];
+
+        foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
+            if (!is_null($row[$dbName])) {
+                $subscription[$xmlName] = $row[$dbName];
+            }
+        }
+
+        return $subscription;
+    }
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this calendar in other methods, such as updateCalendar.
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return int
+     */
+    public function createCalendar($principalUri, $calendarUri, array $properties) {
+        $values = [
+            'principaluri' => $this->convertPrincipal($principalUri, true),
+            'uri' => $calendarUri,
+            'synctoken' => 1,
+            'transparent' => 0,
+            'components' => 'VEVENT,VTODO',
+            'displayname' => $calendarUri
+        ];
+
+        // Default value
+        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+        if (isset($properties[$sccs])) {
+            if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
+                throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
+            }
+            $values['components'] = implode(',',$properties[$sccs]->getValue());
+        } elseif (isset($properties['components'])) {
+            // Allow to provide components internally without having
+            // to create a SupportedCalendarComponentSet object
+            $values['components'] = $properties['components'];
+        }
+
+        $transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+        if (isset($properties[$transp])) {
+            $values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');
+        }
+
+        foreach ($this->propertyMap as $xmlName => $dbName) {
+            if (isset($properties[$xmlName])) {
+                $values[$dbName] = $properties[$xmlName];
+            }
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendars');
+        foreach ($values as $column => $value) {
+            $query->setValue($column, $query->createNamedParameter($value));
+        }
+        $query->executeStatement();
+        $calendarId = $query->getLastInsertId();
+
+        $calendarData = $this->getCalendarById($calendarId);
+        $this->dispatcher->dispatchTyped(new CalendarCreatedEvent((int)$calendarId, $calendarData));
+        $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::createCalendar',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $calendarData,
+            ]));
+
+        return $calendarId;
+    }
+
+    /**
+     * Updates properties for a calendar.
+     *
+     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+     * To do the actual updates, you must tell this object which properties
+     * you're going to process with the handle() method.
+     *
+     * Calling the handle method is like telling the PropPatch object "I
+     * promise I can handle updating this property".
+     *
+     * Read the PropPatch documentation for more info and examples.
+     *
+     * @param mixed $calendarId
+     * @param PropPatch $propPatch
+     * @return void
+     */
+    public function updateCalendar($calendarId, PropPatch $propPatch) {
+        $supportedProperties = array_keys($this->propertyMap);
+        $supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
+
+        $propPatch->handle($supportedProperties, function ($mutations) use ($calendarId) {
+            $newValues = [];
+            foreach ($mutations as $propertyName => $propertyValue) {
+                switch ($propertyName) {
+                    case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp':
+                        $fieldName = 'transparent';
+                        $newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
+                        break;
+                    default:
+                        $fieldName = $this->propertyMap[$propertyName];
+                        $newValues[$fieldName] = $propertyValue;
+                        break;
+                }
+            }
+            $query = $this->db->getQueryBuilder();
+            $query->update('calendars');
+            foreach ($newValues as $fieldName => $value) {
+                $query->set($fieldName, $query->createNamedParameter($value));
+            }
+            $query->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
+            $query->executeStatement();
+
+            $this->addChange($calendarId, "", 2);
+
+            $calendarData = $this->getCalendarById($calendarId);
+            $shares = $this->getShares($calendarId);
+            $this->dispatcher->dispatchTyped(new CalendarUpdatedEvent((int)$calendarId, $calendarData, $shares, $mutations));
+            $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::updateCalendar',
+                [
+                    'calendarId' => $calendarId,
+                    'calendarData' => $calendarData,
+                    'shares' => $shares,
+                    'propertyMutations' => $mutations,
+                ]));
+
+            return true;
+        });
+    }
+
+    /**
+     * Delete a calendar and all it's objects
+     *
+     * @param mixed $calendarId
+     * @return void
+     */
+    public function deleteCalendar($calendarId) {
+        $calendarData = $this->getCalendarById($calendarId);
+        $shares = $this->getShares($calendarId);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `calendartype` = ?');
+        $stmt->execute([$calendarId, self::CALENDAR_TYPE_CALENDAR]);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendars` WHERE `id` = ?');
+        $stmt->execute([$calendarId]);
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarchanges` WHERE `calendarid` = ? AND `calendartype` = ?');
+        $stmt->execute([$calendarId, self::CALENDAR_TYPE_CALENDAR]);
+
+        $this->calendarSharingBackend->deleteAllShares($calendarId);
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)))
+            ->executeStatement();
+
+        // Only dispatch if we actually deleted anything
+        if ($calendarData) {
+            $this->dispatcher->dispatchTyped(new CalendarDeletedEvent((int)$calendarId, $calendarData, $shares));
+        }
+    }
+
+    /**
+     * Delete all of an user's shares
+     *
+     * @param string $principaluri
+     * @return void
+     */
+    public function deleteAllSharesByUser($principaluri) {
+        $this->calendarSharingBackend->deleteAllSharesByUser($principaluri);
+    }
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * calendardata - The iCalendar-compatible calendar data
+     *   * uri - a unique key which will be used to construct the uri. This can
+     *     be any arbitrary string, but making sure it ends with '.ics' is a
+     *     good idea. This is only the basename, or filename, not the full
+     *     path.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+     *   '"abcdef"')
+     *   * size - The size of the calendar objects, in bytes.
+     *   * component - optional, a string containing the type of object, such
+     *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
+     *     the Content-Type header.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned
+     * 'getCalendarObject' will be called later, which *is* expected to return
+     * calendardata.
+     *
+     * If neither etag or size are specified, the calendardata will be
+     * used/fetched to determine these numbers. If both are specified the
+     * amount of times this is needed is reduced by a great degree.
+     *
+     * @param mixed $calendarId
+     * @param int $calendarType
+     * @return array
+     */
+    public function getCalendarObjects($calendarId, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'componenttype', 'classification'])
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+        $stmt = $query->executeQuery();
+
+        $result = [];
+        foreach ($stmt->fetchAll() as $row) {
+            $result[] = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'lastmodified' => $row['lastmodified'],
+                'etag' => '"' . $row['etag'] . '"',
+                'calendarid' => $row['calendarid'],
+                'size' => (int)$row['size'],
+                'component' => strtolower($row['componenttype']),
+                'classification' => (int)$row['classification']
+            ];
+        }
+        $stmt->closeCursor();
+
+        return $result;
+    }
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The
+     * 'calendardata' object is required here though, while it's not required
+     * for getCalendarObjects.
+     *
+     * This method must return null if the object did not exist.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param int $calendarType
+     * @return array|null
+     */
+    public function getCalendarObject($calendarId, $objectUri, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+        $stmt = $query->executeQuery();
+        $row = $stmt->fetch();
+        $stmt->closeCursor();
+
+        if (!$row) {
+            return null;
+        }
+
+        return [
+            'id' => $row['id'],
+            'uri' => $row['uri'],
+            'lastmodified' => $row['lastmodified'],
+            'etag' => '"' . $row['etag'] . '"',
+            'calendarid' => $row['calendarid'],
+            'size' => (int)$row['size'],
+            'calendardata' => $this->readBlob($row['calendardata']),
+            'component' => strtolower($row['componenttype']),
+            'classification' => (int)$row['classification']
+        ];
+    }
+
+    /**
+     * Returns a list of calendar objects.
+     *
+     * This method should work identical to getCalendarObject, but instead
+     * return all the calendar objects in the list as an array.
+     *
+     * If the backend supports this, it may allow for some speed-ups.
+     *
+     * @param mixed $calendarId
+     * @param string[] $uris
+     * @param int $calendarType
+     * @return array
+     */
+    public function getMultipleCalendarObjects($calendarId, array $uris, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
+        if (empty($uris)) {
+            return [];
+        }
+
+        $chunks = array_chunk($uris, 100);
+        $objects = [];
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification'])
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->in('uri', $query->createParameter('uri')))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+
+        foreach ($chunks as $uris) {
+            $query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->executeQuery();
+
+            while ($row = $result->fetch()) {
+                $objects[] = [
+                    'id' => $row['id'],
+                    'uri' => $row['uri'],
+                    'lastmodified' => $row['lastmodified'],
+                    'etag' => '"' . $row['etag'] . '"',
+                    'calendarid' => $row['calendarid'],
+                    'size' => (int)$row['size'],
+                    'calendardata' => $this->readBlob($row['calendardata']),
+                    'component' => strtolower($row['componenttype']),
+                    'classification' => (int)$row['classification']
+                ];
+            }
+            $result->closeCursor();
+        }
+
+        return $objects;
+    }
+
+    /**
+     * Creates a new calendar object.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * It is possible return an etag from this function, which will be used in
+     * the response to this PUT request. Note that the ETag must be surrounded
+     * by double-quotes.
+     *
+     * However, you should only really return this ETag if you don't mangle the
+     * calendar-data. If the result of a subsequent GET to this object is not
+     * the exact same as this request body, you should omit the ETag.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @param int $calendarType
+     * @return string
+     */
+    public function createCalendarObject($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+        $extraData = $this->getDenormalizedData($calendarData);
+
+        $q = $this->db->getQueryBuilder();
+        $q->select($q->func()->count('*'))
+            ->from('calendarobjects')
+            ->where($q->expr()->eq('calendarid', $q->createNamedParameter($calendarId)))
+            ->andWhere($q->expr()->eq('uid', $q->createNamedParameter($extraData['uid'])))
+            ->andWhere($q->expr()->eq('calendartype', $q->createNamedParameter($calendarType)));
+
+        $result = $q->executeQuery();
+        $count = (int) $result->fetchOne();
+        $result->closeCursor();
+
+        if ($count !== 0) {
+            throw new \Sabre\DAV\Exception\BadRequest('Calendar object with uid already exists in this calendar collection.');
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendarobjects')
+            ->values([
+                'calendarid' => $query->createNamedParameter($calendarId),
+                'uri' => $query->createNamedParameter($objectUri),
+                'calendardata' => $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB),
+                'lastmodified' => $query->createNamedParameter(time()),
+                'etag' => $query->createNamedParameter($extraData['etag']),
+                'size' => $query->createNamedParameter($extraData['size']),
+                'componenttype' => $query->createNamedParameter($extraData['componentType']),
+                'firstoccurence' => $query->createNamedParameter($extraData['firstOccurence']),
+                'lastoccurence' => $query->createNamedParameter($extraData['lastOccurence']),
+                'classification' => $query->createNamedParameter($extraData['classification']),
+                'uid' => $query->createNamedParameter($extraData['uid']),
+                'calendartype' => $query->createNamedParameter($calendarType),
+            ])
+            ->executeStatement();
+
+        $this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
+        $this->addChange($calendarId, $objectUri, 1, $calendarType);
+
+        $objectRow = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
+        if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
+            $calendarRow = $this->getCalendarById($calendarId);
+            $shares = $this->getShares($calendarId);
+
+            $this->dispatcher->dispatchTyped(new CalendarObjectCreatedEvent((int)$calendarId, $calendarRow, $shares, $objectRow));
+            $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject',
+                [
+                    'calendarId' => $calendarId,
+                    'calendarData' => $calendarRow,
+                    'shares' => $shares,
+                    'objectData' => $objectRow,
+                ]
+            ));
+        } else {
+            $subscriptionRow = $this->getSubscriptionById($calendarId);
+
+            $this->dispatcher->dispatchTyped(new CachedCalendarObjectCreatedEvent((int)$calendarId, $subscriptionRow, [], $objectRow));
+            $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::createCachedCalendarObject',
+                [
+                    'subscriptionId' => $calendarId,
+                    'calendarData' => $subscriptionRow,
+                    'shares' => [],
+                    'objectData' => $objectRow,
+                ]
+            ));
+        }
+
+        return '"' . $extraData['etag'] . '"';
+    }
+
+    /**
+     * Updates an existing calendarobject, based on it's uri.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * It is possible return an etag from this function, which will be used in
+     * the response to this PUT request. Note that the ETag must be surrounded
+     * by double-quotes.
+     *
+     * However, you should only really return this ETag if you don't mangle the
+     * calendar-data. If the result of a subsequent GET to this object is not
+     * the exact same as this request body, you should omit the ETag.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @param int $calendarType
+     * @return string
+     */
+    public function updateCalendarObject($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+        $extraData = $this->getDenormalizedData($calendarData);
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendarobjects')
+                ->set('calendardata', $query->createNamedParameter($calendarData, IQueryBuilder::PARAM_LOB))
+                ->set('lastmodified', $query->createNamedParameter(time()))
+                ->set('etag', $query->createNamedParameter($extraData['etag']))
+                ->set('size', $query->createNamedParameter($extraData['size']))
+                ->set('componenttype', $query->createNamedParameter($extraData['componentType']))
+                ->set('firstoccurence', $query->createNamedParameter($extraData['firstOccurence']))
+                ->set('lastoccurence', $query->createNamedParameter($extraData['lastOccurence']))
+                ->set('classification', $query->createNamedParameter($extraData['classification']))
+                ->set('uid', $query->createNamedParameter($extraData['uid']))
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)))
+            ->executeStatement();
+
+        $this->updateProperties($calendarId, $objectUri, $calendarData, $calendarType);
+        $this->addChange($calendarId, $objectUri, 2, $calendarType);
+
+        $objectRow = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
+        if (is_array($objectRow)) {
+            if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
+                $calendarRow = $this->getCalendarById($calendarId);
+                $shares = $this->getShares($calendarId);
+
+                $this->dispatcher->dispatchTyped(new CalendarObjectUpdatedEvent((int)$calendarId, $calendarRow, $shares, $objectRow));
+                $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', new GenericEvent(
+                    '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject',
+                    [
+                        'calendarId' => $calendarId,
+                        'calendarData' => $calendarRow,
+                        'shares' => $shares,
+                        'objectData' => $objectRow,
+                    ]
+                ));
+            } else {
+                $subscriptionRow = $this->getSubscriptionById($calendarId);
+
+                $this->dispatcher->dispatchTyped(new CachedCalendarObjectUpdatedEvent((int)$calendarId, $subscriptionRow, [], $objectRow));
+                $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject', new GenericEvent(
+                    '\OCA\DAV\CalDAV\CalDavBackend::updateCachedCalendarObject',
+                    [
+                        'subscriptionId' => $calendarId,
+                        'calendarData' => $subscriptionRow,
+                        'shares' => [],
+                        'objectData' => $objectRow,
+                    ]
+                ));
+            }
+        }
+
+        return '"' . $extraData['etag'] . '"';
+    }
+
+    /**
+     * @param int $calendarObjectId
+     * @param int $classification
+     */
+    public function setClassification($calendarObjectId, $classification) {
+        if (!in_array($classification, [
+            self::CLASSIFICATION_PUBLIC, self::CLASSIFICATION_PRIVATE, self::CLASSIFICATION_CONFIDENTIAL
+        ])) {
+            throw new \InvalidArgumentException();
+        }
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendarobjects')
+            ->set('classification', $query->createNamedParameter($classification))
+            ->where($query->expr()->eq('id', $query->createNamedParameter($calendarObjectId)))
+            ->executeStatement();
+    }
+
+    /**
+     * Deletes an existing calendar object.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param int $calendarType
+     * @return void
+     */
+    public function deleteCalendarObject($calendarId, $objectUri, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+        $data = $this->getCalendarObject($calendarId, $objectUri, $calendarType);
+        if (is_array($data)) {
+            if ($calendarType === self::CALENDAR_TYPE_CALENDAR) {
+                $calendarRow = $this->getCalendarById($calendarId);
+                $shares = $this->getShares($calendarId);
+
+                $this->dispatcher->dispatchTyped(new CalendarObjectDeletedEvent((int)$calendarId, $calendarRow, $shares, $data));
+                $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', new GenericEvent(
+                    '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject',
+                    [
+                        'calendarId' => $calendarId,
+                        'calendarData' => $calendarRow,
+                        'shares' => $shares,
+                        'objectData' => $data,
+                    ]
+                ));
+            } else {
+                $subscriptionRow = $this->getSubscriptionById($calendarId);
+
+                $this->dispatcher->dispatchTyped(new CachedCalendarObjectDeletedEvent((int)$calendarId, $subscriptionRow, [], $data));
+                $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject', new GenericEvent(
+                    '\OCA\DAV\CalDAV\CalDavBackend::deleteCachedCalendarObject',
+                    [
+                        'subscriptionId' => $calendarId,
+                        'calendarData' => $subscriptionRow,
+                        'shares' => [],
+                        'objectData' => $data,
+                    ]
+                ));
+            }
+        }
+
+        $stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ? AND `calendartype` = ?');
+        $stmt->execute([$calendarId, $objectUri, $calendarType]);
+
+        if (is_array($data)) {
+            $this->purgeProperties($calendarId, $data['id'], $calendarType);
+        }
+
+        $this->addChange($calendarId, $objectUri, 3, $calendarType);
+    }
+
+    /**
+     * Performs a calendar-query on the contents of this calendar.
+     *
+     * The calendar-query is defined in RFC4791 : CalDAV. Using the
+     * calendar-query it is possible for a client to request a specific set of
+     * object, based on contents of iCalendar properties, date-ranges and
+     * iCalendar component types (VTODO, VEVENT).
+     *
+     * This method should just return a list of (relative) urls that match this
+     * query.
+     *
+     * The list of filters are specified as an array. The exact array is
+     * documented by Sabre\CalDAV\CalendarQueryParser.
+     *
+     * Note that it is extremely likely that getCalendarObject for every path
+     * returned from this method will be called almost immediately after. You
+     * may want to anticipate this to speed up these requests.
+     *
+     * This method provides a default implementation, which parses *all* the
+     * iCalendar objects in the specified calendar.
+     *
+     * This default may well be good enough for personal use, and calendars
+     * that aren't very large. But if you anticipate high usage, big calendars
+     * or high loads, you are strongly advised to optimize certain paths.
+     *
+     * The best way to do so is override this method and to optimize
+     * specifically for 'common filters'.
+     *
+     * Requests that are extremely common are:
+     *   * requests for just VEVENTS
+     *   * requests for just VTODO
+     *   * requests with a time-range-filter on either VEVENT or VTODO.
+     *
+     * ..and combinations of these requests. It may not be worth it to try to
+     * handle every possible situation and just rely on the (relatively
+     * easy to use) CalendarQueryValidator to handle the rest.
+     *
+     * Note that especially time-range-filters may be difficult to parse. A
+     * time-range filter specified on a VEVENT must for instance also handle
+     * recurrence rules correctly.
+     * A good example of how to interprete all these filters can also simply
+     * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+     * as possible, so it gives you a good idea on what type of stuff you need
+     * to think of.
+     *
+     * @param mixed $calendarId
+     * @param array $filters
+     * @param int $calendarType
+     * @return array
+     */
+    public function calendarQuery($calendarId, array $filters, $calendarType = self::CALENDAR_TYPE_CALENDAR):array {
+        $componentType = null;
+        $requirePostFilter = true;
+        $timeRange = null;
+
+        // if no filters were specified, we don't need to filter after a query
+        if (!$filters['prop-filters'] && !$filters['comp-filters']) {
+            $requirePostFilter = false;
+        }
+
+        // Figuring out if there's a component filter
+        if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
+            $componentType = $filters['comp-filters'][0]['name'];
+
+            // Checking if we need post-filters
+            if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
+                $requirePostFilter = false;
+            }
+            // There was a time-range filter
+            if ($componentType === 'VEVENT' && isset($filters['comp-filters'][0]['time-range']) && is_array($filters['comp-filters'][0]['time-range'])) {
+                $timeRange = $filters['comp-filters'][0]['time-range'];
+
+                // If start time OR the end time is not specified, we can do a
+                // 100% accurate mysql query.
+                if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
+                    $requirePostFilter = false;
+                }
+            }
+        }
+        $columns = ['uri'];
+        if ($requirePostFilter) {
+            $columns = ['uri', 'calendardata'];
+        }
+        $query = $this->db->getQueryBuilder();
+        $query->select($columns)
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+
+        if ($componentType) {
+            $query->andWhere($query->expr()->eq('componenttype', $query->createNamedParameter($componentType)));
+        }
+
+        if ($timeRange && $timeRange['start']) {
+            $query->andWhere($query->expr()->gt('lastoccurence', $query->createNamedParameter($timeRange['start']->getTimeStamp())));
+        }
+        if ($timeRange && $timeRange['end']) {
+            $query->andWhere($query->expr()->lt('firstoccurence', $query->createNamedParameter($timeRange['end']->getTimeStamp())));
+        }
+
+        $stmt = $query->executeQuery();
+
+        $result = [];
+        while ($row = $stmt->fetch()) {
+            if ($requirePostFilter) {
+                // validateFilterForObject will parse the calendar data
+                // catch parsing errors
+                try {
+                    $matches = $this->validateFilterForObject($row, $filters);
+                } catch (ParseException $ex) {
+                    $this->logger->logException($ex, [
+                        'app' => 'dav',
+                        'message' => 'Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri']
+                    ]);
+                    continue;
+                } catch (InvalidDataException $ex) {
+                    $this->logger->logException($ex, [
+                        'app' => 'dav',
+                        'message' => 'Caught invalid data exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri']
+                    ]);
+                    continue;
+                }
+
+                if (!$matches) {
+                    continue;
+                }
+            }
+            $result[] = $row['uri'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * custom Nextcloud search extension for CalDAV
+     *
+     * TODO - this should optionally cover cached calendar objects as well
+     *
+     * @param string $principalUri
+     * @param array $filters
+     * @param integer|null $limit
+     * @param integer|null $offset
+     * @return array
+     */
+    public function calendarSearch($principalUri, array $filters, $limit = null, $offset = null) {
+        $calendars = $this->getCalendarsForUser($principalUri);
+        $ownCalendars = [];
+        $sharedCalendars = [];
+
+        $uriMapper = [];
+
+        foreach ($calendars as $calendar) {
+            if ($calendar['{http://owncloud.org/ns}owner-principal'] === $principalUri) {
+                $ownCalendars[] = $calendar['id'];
+            } else {
+                $sharedCalendars[] = $calendar['id'];
+            }
+            $uriMapper[$calendar['id']] = $calendar['uri'];
+        }
+        if (count($ownCalendars) === 0 && count($sharedCalendars) === 0) {
+            return [];
+        }
+
+        $query = $this->db->getQueryBuilder();
+        // Calendar id expressions
+        $calendarExpressions = [];
+        foreach ($ownCalendars as $id) {
+            $calendarExpressions[] = $query->expr()->andX(
+                $query->expr()->eq('c.calendarid',
+                    $query->createNamedParameter($id)),
+                $query->expr()->eq('c.calendartype',
+                        $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
+        }
+        foreach ($sharedCalendars as $id) {
+            $calendarExpressions[] = $query->expr()->andX(
+                $query->expr()->eq('c.calendarid',
+                    $query->createNamedParameter($id)),
+                $query->expr()->eq('c.classification',
+                    $query->createNamedParameter(self::CLASSIFICATION_PUBLIC)),
+                $query->expr()->eq('c.calendartype',
+                    $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
+        }
+
+        if (count($calendarExpressions) === 1) {
+            $calExpr = $calendarExpressions[0];
+        } else {
+            $calExpr = call_user_func_array([$query->expr(), 'orX'], $calendarExpressions);
+        }
+
+        // Component expressions
+        $compExpressions = [];
+        foreach ($filters['comps'] as $comp) {
+            $compExpressions[] = $query->expr()
+                ->eq('c.componenttype', $query->createNamedParameter($comp));
+        }
+
+        if (count($compExpressions) === 1) {
+            $compExpr = $compExpressions[0];
+        } else {
+            $compExpr = call_user_func_array([$query->expr(), 'orX'], $compExpressions);
+        }
+
+        if (!isset($filters['props'])) {
+            $filters['props'] = [];
+        }
+        if (!isset($filters['params'])) {
+            $filters['params'] = [];
+        }
+
+        $propParamExpressions = [];
+        foreach ($filters['props'] as $prop) {
+            $propParamExpressions[] = $query->expr()->andX(
+                $query->expr()->eq('i.name', $query->createNamedParameter($prop)),
+                $query->expr()->isNull('i.parameter')
+            );
+        }
+        foreach ($filters['params'] as $param) {
+            $propParamExpressions[] = $query->expr()->andX(
+                $query->expr()->eq('i.name', $query->createNamedParameter($param['property'])),
+                $query->expr()->eq('i.parameter', $query->createNamedParameter($param['parameter']))
+            );
+        }
+
+        if (count($propParamExpressions) === 1) {
+            $propParamExpr = $propParamExpressions[0];
+        } else {
+            $propParamExpr = call_user_func_array([$query->expr(), 'orX'], $propParamExpressions);
+        }
+
+        $query->select(['c.calendarid', 'c.uri'])
+            ->from($this->dbObjectPropertiesTable, 'i')
+            ->join('i', 'calendarobjects', 'c', $query->expr()->eq('i.objectid', 'c.id'))
+            ->where($calExpr)
+            ->andWhere($compExpr)
+            ->andWhere($propParamExpr)
+            ->andWhere($query->expr()->iLike('i.value',
+                $query->createNamedParameter('%'.$this->db->escapeLikeParameter($filters['search-term']).'%')));
+
+        if ($offset) {
+            $query->setFirstResult($offset);
+        }
+        if ($limit) {
+            $query->setMaxResults($limit);
+        }
+
+        $stmt = $query->executeQuery();
+
+        $result = [];
+        while ($row = $stmt->fetch()) {
+            $path = $uriMapper[$row['calendarid']] . '/' . $row['uri'];
+            if (!in_array($path, $result)) {
+                $result[] = $path;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * used for Nextcloud's calendar API
+     *
+     * @param array $calendarInfo
+     * @param string $pattern
+     * @param array $searchProperties
+     * @param array $options
+     * @param integer|null $limit
+     * @param integer|null $offset
+     *
+     * @return array
+     */
+    public function search(array $calendarInfo, $pattern, array $searchProperties,
+                            array $options, $limit, $offset) {
+        $outerQuery = $this->db->getQueryBuilder();
+        $innerQuery = $this->db->getQueryBuilder();
+
+        $innerQuery->selectDistinct('op.objectid')
+            ->from($this->dbObjectPropertiesTable, 'op')
+            ->andWhere($innerQuery->expr()->eq('op.calendarid',
+                $outerQuery->createNamedParameter($calendarInfo['id'])))
+            ->andWhere($innerQuery->expr()->eq('op.calendartype',
+                $outerQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
+
+        // only return public items for shared calendars for now
+        if ($calendarInfo['principaluri'] !== $calendarInfo['{http://owncloud.org/ns}owner-principal']) {
+            $innerQuery->andWhere($innerQuery->expr()->eq('c.classification',
+                $outerQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
+        }
+
+        $or = $innerQuery->expr()->orX();
+        foreach ($searchProperties as $searchProperty) {
+            $or->add($innerQuery->expr()->eq('op.name',
+                $outerQuery->createNamedParameter($searchProperty)));
+        }
+        $innerQuery->andWhere($or);
+
+        if ($pattern !== '') {
+            $innerQuery->andWhere($innerQuery->expr()->iLike('op.value',
+                $outerQuery->createNamedParameter('%' .
+                    $this->db->escapeLikeParameter($pattern) . '%')));
+        }
+
+        $outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri')
+            ->from('calendarobjects', 'c');
+
+        if (isset($options['timerange'])) {
+            if (isset($options['timerange']['start']) && $options['timerange']['start'] instanceof DateTime) {
+                $outerQuery->andWhere($outerQuery->expr()->gt('lastoccurence',
+                    $outerQuery->createNamedParameter($options['timerange']['start']->getTimeStamp())));
+            }
+            if (isset($options['timerange']['end']) && $options['timerange']['end'] instanceof DateTime) {
+                $outerQuery->andWhere($outerQuery->expr()->lt('firstoccurence',
+                    $outerQuery->createNamedParameter($options['timerange']['end']->getTimeStamp())));
+            }
+        }
+
+        if (isset($options['types'])) {
+            $or = $outerQuery->expr()->orX();
+            foreach ($options['types'] as $type) {
+                $or->add($outerQuery->expr()->eq('componenttype',
+                    $outerQuery->createNamedParameter($type)));
+            }
+            $outerQuery->andWhere($or);
+        }
+
+        $outerQuery->andWhere($outerQuery->expr()->in('c.id',
+            $outerQuery->createFunction($innerQuery->getSQL())));
+
+        if ($offset) {
+            $outerQuery->setFirstResult($offset);
+        }
+        if ($limit) {
+            $outerQuery->setMaxResults($limit);
+        }
+
+        $result = $outerQuery->executeQuery();
+        $calendarObjects = $result->fetchAll();
+
+        return array_map(function ($o) {
+            $calendarData = Reader::read($o['calendardata']);
+            $comps = $calendarData->getComponents();
+            $objects = [];
+            $timezones = [];
+            foreach ($comps as $comp) {
+                if ($comp instanceof VTimeZone) {
+                    $timezones[] = $comp;
+                } else {
+                    $objects[] = $comp;
+                }
+            }
+
+            return [
+                'id' => $o['id'],
+                'type' => $o['componenttype'],
+                'uid' => $o['uid'],
+                'uri' => $o['uri'],
+                'objects' => array_map(function ($c) {
+                    return $this->transformSearchData($c);
+                }, $objects),
+                'timezones' => array_map(function ($c) {
+                    return $this->transformSearchData($c);
+                }, $timezones),
+            ];
+        }, $calendarObjects);
+    }
+
+    /**
+     * @param Component $comp
+     * @return array
+     */
+    private function transformSearchData(Component $comp) {
+        $data = [];
+        /** @var Component[] $subComponents */
+        $subComponents = $comp->getComponents();
+        /** @var Property[] $properties */
+        $properties = array_filter($comp->children(), function ($c) {
+            return $c instanceof Property;
+        });
+        $validationRules = $comp->getValidationRules();
+
+        foreach ($subComponents as $subComponent) {
+            $name = $subComponent->name;
+            if (!isset($data[$name])) {
+                $data[$name] = [];
+            }
+            $data[$name][] = $this->transformSearchData($subComponent);
+        }
+
+        foreach ($properties as $property) {
+            $name = $property->name;
+            if (!isset($validationRules[$name])) {
+                $validationRules[$name] = '*';
+            }
+
+            $rule = $validationRules[$property->name];
+            if ($rule === '+' || $rule === '*') { // multiple
+                if (!isset($data[$name])) {
+                    $data[$name] = [];
+                }
+
+                $data[$name][] = $this->transformSearchProperty($property);
+            } else { // once
+                $data[$name] = $this->transformSearchProperty($property);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param Property $prop
+     * @return array
+     */
+    private function transformSearchProperty(Property $prop) {
+        // No need to check Date, as it extends DateTime
+        if ($prop instanceof Property\ICalendar\DateTime) {
+            $value = $prop->getDateTime();
+        } else {
+            $value = $prop->getValue();
+        }
+
+        return [
+            $value,
+            $prop->parameters()
+        ];
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $pattern
+     * @param array $componentTypes
+     * @param array $searchProperties
+     * @param array $searchParameters
+     * @param array $options
+     * @return array
+     */
+    public function searchPrincipalUri(string $principalUri,
+                                        string $pattern,
+                                        array $componentTypes,
+                                        array $searchProperties,
+                                        array $searchParameters,
+                                        array $options = []): array {
+        $escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
+
+        $calendarObjectIdQuery = $this->db->getQueryBuilder();
+        $calendarOr = $calendarObjectIdQuery->expr()->orX();
+        $searchOr = $calendarObjectIdQuery->expr()->orX();
+
+        // Fetch calendars and subscription
+        $calendars = $this->getCalendarsForUser($principalUri);
+        $subscriptions = $this->getSubscriptionsForUser($principalUri);
+        foreach ($calendars as $calendar) {
+            $calendarAnd = $calendarObjectIdQuery->expr()->andX();
+            $calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$calendar['id'])));
+            $calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));
+
+            // If it's shared, limit search to public events
+            if (isset($calendar['{http://owncloud.org/ns}owner-principal'])
+                && $calendar['principaluri'] !== $calendar['{http://owncloud.org/ns}owner-principal']) {
+                $calendarAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
+            }
+
+            $calendarOr->add($calendarAnd);
+        }
+        foreach ($subscriptions as $subscription) {
+            $subscriptionAnd = $calendarObjectIdQuery->expr()->andX();
+            $subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendarid', $calendarObjectIdQuery->createNamedParameter((int)$subscription['id'])));
+            $subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
+
+            // If it's shared, limit search to public events
+            if (isset($subscription['{http://owncloud.org/ns}owner-principal'])
+                && $subscription['principaluri'] !== $subscription['{http://owncloud.org/ns}owner-principal']) {
+                $subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
+            }
+
+            $calendarOr->add($subscriptionAnd);
+        }
+
+        foreach ($searchProperties as $property) {
+            $propertyAnd = $calendarObjectIdQuery->expr()->andX();
+            $propertyAnd->add($calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)));
+            $propertyAnd->add($calendarObjectIdQuery->expr()->isNull('cob.parameter'));
+
+            $searchOr->add($propertyAnd);
+        }
+        foreach ($searchParameters as $property => $parameter) {
+            $parameterAnd = $calendarObjectIdQuery->expr()->andX();
+            $parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.name', $calendarObjectIdQuery->createNamedParameter($property, IQueryBuilder::PARAM_STR)));
+            $parameterAnd->add($calendarObjectIdQuery->expr()->eq('cob.parameter', $calendarObjectIdQuery->createNamedParameter($parameter, IQueryBuilder::PARAM_STR_ARRAY)));
+
+            $searchOr->add($parameterAnd);
+        }
+
+        if ($calendarOr->count() === 0) {
+            return [];
+        }
+        if ($searchOr->count() === 0) {
+            return [];
+        }
+
+        $calendarObjectIdQuery->selectDistinct('cob.objectid')
+            ->from($this->dbObjectPropertiesTable, 'cob')
+            ->leftJoin('cob', 'calendarobjects', 'co', $calendarObjectIdQuery->expr()->eq('co.id', 'cob.objectid'))
+            ->andWhere($calendarObjectIdQuery->expr()->in('co.componenttype', $calendarObjectIdQuery->createNamedParameter($componentTypes, IQueryBuilder::PARAM_STR_ARRAY)))
+            ->andWhere($calendarOr)
+            ->andWhere($searchOr);
+
+        if ('' !== $pattern) {
+            if (!$escapePattern) {
+                $calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->ilike('cob.value', $calendarObjectIdQuery->createNamedParameter($pattern)));
+            } else {
+                $calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->ilike('cob.value', $calendarObjectIdQuery->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
+            }
+        }
+
+        if (isset($options['limit'])) {
+            $calendarObjectIdQuery->setMaxResults($options['limit']);
+        }
+        if (isset($options['offset'])) {
+            $calendarObjectIdQuery->setFirstResult($options['offset']);
+        }
+
+        $result = $calendarObjectIdQuery->executeQuery();
+        $matches = $result->fetchAll();
+        $result->closeCursor();
+        $matches = array_map(static function (array $match):int {
+            return (int) $match['objectid'];
+        }, $matches);
+
+        $query = $this->db->getQueryBuilder();
+        $query->select('calendardata', 'uri', 'calendarid', 'calendartype')
+            ->from('calendarobjects')
+            ->where($query->expr()->in('id', $query->createNamedParameter($matches, IQueryBuilder::PARAM_INT_ARRAY)));
+
+        $result = $query->executeQuery();
+        $calendarObjects = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_map(function (array $array): array {
+            $array['calendarid'] = (int)$array['calendarid'];
+            $array['calendartype'] = (int)$array['calendartype'];
+            $array['calendardata'] = $this->readBlob($array['calendardata']);
+
+            return $array;
+        }, $calendarObjects);
+    }
+
+    /**
+     * Searches through all of a users calendars and calendar objects to find
+     * an object with a specific UID.
+     *
+     * This method should return the path to this object, relative to the
+     * calendar home, so this path usually only contains two parts:
+     *
+     * calendarpath/objectpath.ics
+     *
+     * If the uid is not found, return null.
+     *
+     * This method should only consider * objects that the principal owns, so
+     * any calendars owned by other principals that also appear in this
+     * collection should be ignored.
+     *
+     * @param string $principalUri
+     * @param string $uid
+     * @return string|null
+     */
+    public function getCalendarObjectByUID($principalUri, $uid) {
+        $query = $this->db->getQueryBuilder();
+        $query->selectAlias('c.uri', 'calendaruri')->selectAlias('co.uri', 'objecturi')
+            ->from('calendarobjects', 'co')
+            ->leftJoin('co', 'calendars', 'c', $query->expr()->eq('co.calendarid', 'c.id'))
+            ->where($query->expr()->eq('c.principaluri', $query->createNamedParameter($principalUri)))
+            ->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)));
+
+        $stmt = $query->executeQuery();
+        $row = $stmt->fetch();
+        $stmt->closeCursor();
+        if ($row) {
+            return $row['calendaruri'] . '/' . $row['objecturi'];
+        }
+
+        return null;
+    }
+
+    /**
+     * The getChanges method returns all the changes that have happened, since
+     * the specified syncToken in the specified calendar.
+     *
+     * This function should return an array, such as the following:
+     *
+     * [
+     *   'syncToken' => 'The current synctoken',
+     *   'added'   => [
+     *      'new.txt',
+     *   ],
+     *   'modified'   => [
+     *      'modified.txt',
+     *   ],
+     *   'deleted' => [
+     *      'foo.php.bak',
+     *      'old.txt'
+     *   ]
+     * );
+     *
+     * The returned syncToken property should reflect the *current* syncToken
+     * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
+     * property This is * needed here too, to ensure the operation is atomic.
+     *
+     * If the $syncToken argument is specified as null, this is an initial
+     * sync, and all members should be reported.
+     *
+     * The modified property is an array of nodenames that have changed since
+     * the last token.
+     *
+     * The deleted property is an array with nodenames, that have been deleted
+     * from collection.
+     *
+     * The $syncLevel argument is basically the 'depth' of the report. If it's
+     * 1, you only have to report changes that happened only directly in
+     * immediate descendants. If it's 2, it should also include changes from
+     * the nodes below the child collections. (grandchildren)
+     *
+     * The $limit argument allows a client to specify how many results should
+     * be returned at most. If the limit is not specified, it should be treated
+     * as infinite.
+     *
+     * If the limit (infinite or not) is higher than you're willing to return,
+     * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
+     *
+     * If the syncToken is expired (due to data cleanup) or unknown, you must
+     * return null.
+     *
+     * The limit is 'suggestive'. You are free to ignore it.
+     *
+     * @param string $calendarId
+     * @param string $syncToken
+     * @param int $syncLevel
+     * @param int|null $limit
+     * @param int $calendarType
+     * @return array
+     */
+    public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+        // Current synctoken
+        $qb = $this->db->getQueryBuilder();
+        $qb->select('synctoken')
+            ->from('calendars')
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($calendarId))
+            );
+        $stmt = $qb->executeQuery();
+        $currentToken = $stmt->fetchOne();
+
+        if ($currentToken === false) {
+            return null;
+        }
+
+        $result = [
+            'syncToken' => $currentToken,
+            'added' => [],
+            'modified' => [],
+            'deleted' => [],
+        ];
+
+        if ($syncToken) {
+            $qb = $this->db->getQueryBuilder();
+
+            $qb->select('uri', 'operation')
+                ->from('calendarchanges')
+                ->where(
+                    $qb->expr()->andX(
+                        $qb->expr()->gte('synctoken', $qb->createNamedParameter($syncToken)),
+                        $qb->expr()->lt('synctoken', $qb->createNamedParameter($currentToken)),
+                        $qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)),
+                        $qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType))
+                    )
+                )->orderBy('synctoken');
+            if (is_int($limit) && $limit > 0) {
+                $qb->setMaxResults($limit);
+            }
+
+            // Fetching all changes
+            $stmt = $qb->executeQuery();
+            $changes = [];
+
+            // This loop ensures that any duplicates are overwritten, only the
+            // last change on a node is relevant.
+            while ($row = $stmt->fetch()) {
+                $changes[$row['uri']] = $row['operation'];
+            }
+            $stmt->closeCursor();
+
+            foreach ($changes as $uri => $operation) {
+                switch ($operation) {
+                    case 1:
+                        $result['added'][] = $uri;
+                        break;
+                    case 2:
+                        $result['modified'][] = $uri;
+                        break;
+                    case 3:
+                        $result['deleted'][] = $uri;
+                        break;
+                }
+            }
+        } else {
+            // No synctoken supplied, this is the initial sync.
+            $qb = $this->db->getQueryBuilder();
+            $qb->select('uri')
+                ->from('calendarobjects')
+                ->where(
+                    $qb->expr()->andX(
+                        $qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)),
+                        $qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType))
+                    )
+                );
+            $stmt = $qb->executeQuery();
+            $result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+            $stmt->closeCursor();
+        }
+        return $result;
+    }
+
+    /**
+     * Returns a list of subscriptions for a principal.
+     *
+     * Every subscription is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    subscription. This can be the same as the uri or a database key.
+     *  * uri. This is just the 'base uri' or 'filename' of the subscription.
+     *  * principaluri. The owner of the subscription. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore, all the subscription info must be returned too:
+     *
+     * 1. {DAV:}displayname
+     * 2. {http://apple.com/ns/ical/}refreshrate
+     * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
+     *    should not be stripped).
+     * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
+     *    should not be stripped).
+     * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
+     *    attachments should not be stripped).
+     * 6. {http://calendarserver.org/ns/}source (Must be a
+     *     Sabre\DAV\Property\Href).
+     * 7. {http://apple.com/ns/ical/}calendar-color
+     * 8. {http://apple.com/ns/ical/}calendar-order
+     * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+     *    (should just be an instance of
+     *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
+     *    default components).
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getSubscriptionsForUser($principalUri) {
+        $fields = array_values($this->subscriptionPropertyMap);
+        $fields[] = 'id';
+        $fields[] = 'uri';
+        $fields[] = 'source';
+        $fields[] = 'principaluri';
+        $fields[] = 'lastmodified';
+        $fields[] = 'synctoken';
+
+        $query = $this->db->getQueryBuilder();
+        $query->select($fields)
+            ->from('calendarsubscriptions')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+            ->orderBy('calendarorder', 'asc');
+        $stmt = $query->executeQuery();
+
+        $subscriptions = [];
+        while ($row = $stmt->fetch()) {
+            $subscription = [
+                'id' => $row['id'],
+                'uri' => $row['uri'],
+                'principaluri' => $row['principaluri'],
+                'source' => $row['source'],
+                'lastmodified' => $row['lastmodified'],
+
+                '{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+                '{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
+            ];
+
+            foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
+                if (!is_null($row[$dbName])) {
+                    $subscription[$xmlName] = $row[$dbName];
+                }
+            }
+
+            $subscriptions[] = $subscription;
+        }
+
+        return $subscriptions;
+    }
+
+    /**
+     * Creates a new subscription for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used to reference
+     * this subscription in other methods, such as updateSubscription.
+     *
+     * @param string $principalUri
+     * @param string $uri
+     * @param array $properties
+     * @return mixed
+     */
+    public function createSubscription($principalUri, $uri, array $properties) {
+        if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
+            throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
+        }
+
+        $values = [
+            'principaluri' => $principalUri,
+            'uri' => $uri,
+            'source' => $properties['{http://calendarserver.org/ns/}source']->getHref(),
+            'lastmodified' => time(),
+        ];
+
+        $propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
+
+        foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
+            if (array_key_exists($xmlName, $properties)) {
+                $values[$dbName] = $properties[$xmlName];
+                if (in_array($dbName, $propertiesBoolean)) {
+                    $values[$dbName] = true;
+                }
+            }
+        }
+
+        $valuesToInsert = [];
+
+        $query = $this->db->getQueryBuilder();
+
+        foreach (array_keys($values) as $name) {
+            $valuesToInsert[$name] = $query->createNamedParameter($values[$name]);
+        }
+
+        $query->insert('calendarsubscriptions')
+            ->values($valuesToInsert)
+            ->executeStatement();
+
+        $subscriptionId = $query->getLastInsertId();
+
+        $subscriptionRow = $this->getSubscriptionById($subscriptionId);
+        $this->dispatcher->dispatchTyped(new SubscriptionCreatedEvent($subscriptionId, $subscriptionRow));
+        $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::createSubscription', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
+            [
+                'subscriptionId' => $subscriptionId,
+                'subscriptionData' => $subscriptionRow,
+            ]));
+
+        return $subscriptionId;
+    }
+
+    /**
+     * Updates a subscription
+     *
+     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+     * To do the actual updates, you must tell this object which properties
+     * you're going to process with the handle() method.
+     *
+     * Calling the handle method is like telling the PropPatch object "I
+     * promise I can handle updating this property".
+     *
+     * Read the PropPatch documentation for more info and examples.
+     *
+     * @param mixed $subscriptionId
+     * @param PropPatch $propPatch
+     * @return void
+     */
+    public function updateSubscription($subscriptionId, PropPatch $propPatch) {
+        $supportedProperties = array_keys($this->subscriptionPropertyMap);
+        $supportedProperties[] = '{http://calendarserver.org/ns/}source';
+
+        $propPatch->handle($supportedProperties, function ($mutations) use ($subscriptionId) {
+            $newValues = [];
+
+            foreach ($mutations as $propertyName => $propertyValue) {
+                if ($propertyName === '{http://calendarserver.org/ns/}source') {
+                    $newValues['source'] = $propertyValue->getHref();
+                } else {
+                    $fieldName = $this->subscriptionPropertyMap[$propertyName];
+                    $newValues[$fieldName] = $propertyValue;
+                }
+            }
+
+            $query = $this->db->getQueryBuilder();
+            $query->update('calendarsubscriptions')
+                ->set('lastmodified', $query->createNamedParameter(time()));
+            foreach ($newValues as $fieldName => $value) {
+                $query->set($fieldName, $query->createNamedParameter($value));
+            }
+            $query->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
+                ->executeStatement();
+
+            $subscriptionRow = $this->getSubscriptionById($subscriptionId);
+            $this->dispatcher->dispatchTyped(new SubscriptionUpdatedEvent((int)$subscriptionId, $subscriptionRow, [], $mutations));
+            $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateSubscription', new GenericEvent(
+                '\OCA\DAV\CalDAV\CalDavBackend::updateSubscription',
+                [
+                    'subscriptionId' => $subscriptionId,
+                    'subscriptionData' => $subscriptionRow,
+                    'propertyMutations' => $mutations,
+                ]));
+
+            return true;
+        });
+    }
+
+    /**
+     * Deletes a subscription.
+     *
+     * @param mixed $subscriptionId
+     * @return void
+     */
+    public function deleteSubscription($subscriptionId) {
+        $subscriptionRow = $this->getSubscriptionById($subscriptionId);
+
+        $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
+            [
+                'subscriptionId' => $subscriptionId,
+                'subscriptionData' => $this->getSubscriptionById($subscriptionId),
+            ]));
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendarsubscriptions')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
+            ->executeStatement();
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->executeStatement();
+
+        $query->delete('calendarchanges')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->executeStatement();
+
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->executeStatement();
+
+        if ($subscriptionRow) {
+            $this->dispatcher->dispatchTyped(new SubscriptionDeletedEvent((int)$subscriptionId, $subscriptionRow, []));
+        }
+    }
+
+    /**
+     * Returns a single scheduling object for the inbox collection.
+     *
+     * The returned array should contain the following elements:
+     *   * uri - A unique basename for the object. This will be used to
+     *           construct a full uri.
+     *   * calendardata - The iCalendar object
+     *   * lastmodified - The last modification date. Can be an int for a unix
+     *                    timestamp, or a PHP DateTime object.
+     *   * etag - A unique token that must change if the object changed.
+     *   * size - The size of the object, in bytes.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @return array
+     */
+    public function getSchedulingObject($principalUri, $objectUri) {
+        $query = $this->db->getQueryBuilder();
+        $stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
+            ->from('schedulingobjects')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+            ->executeQuery();
+
+        $row = $stmt->fetch();
+
+        if (!$row) {
+            return null;
+        }
+
+        return [
+            'uri' => $row['uri'],
+            'calendardata' => $row['calendardata'],
+            'lastmodified' => $row['lastmodified'],
+            'etag' => '"' . $row['etag'] . '"',
+            'size' => (int)$row['size'],
+        ];
+    }
+
+    /**
+     * Returns all scheduling objects for the inbox collection.
+     *
+     * These objects should be returned as an array. Every item in the array
+     * should follow the same structure as returned from getSchedulingObject.
+     *
+     * The main difference is that 'calendardata' is optional.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    public function getSchedulingObjects($principalUri) {
+        $query = $this->db->getQueryBuilder();
+        $stmt = $query->select(['uri', 'calendardata', 'lastmodified', 'etag', 'size'])
+                ->from('schedulingobjects')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+                ->executeQuery();
+
+        $result = [];
+        foreach ($stmt->fetchAll() as $row) {
+            $result[] = [
+                'calendardata' => $row['calendardata'],
+                'uri' => $row['uri'],
+                'lastmodified' => $row['lastmodified'],
+                'etag' => '"' . $row['etag'] . '"',
+                'size' => (int)$row['size'],
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes a scheduling object from the inbox collection.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @return void
+     */
+    public function deleteSchedulingObject($principalUri, $objectUri) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('schedulingobjects')
+                ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
+                ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri)))
+                ->executeStatement();
+    }
+
+    /**
+     * Creates a new scheduling object. This should land in a users' inbox.
+     *
+     * @param string $principalUri
+     * @param string $objectUri
+     * @param string $objectData
+     * @return void
+     */
+    public function createSchedulingObject($principalUri, $objectUri, $objectData) {
+        $query = $this->db->getQueryBuilder();
+        $query->insert('schedulingobjects')
+            ->values([
+                'principaluri' => $query->createNamedParameter($principalUri),
+                'calendardata' => $query->createNamedParameter($objectData, IQueryBuilder::PARAM_LOB),
+                'uri' => $query->createNamedParameter($objectUri),
+                'lastmodified' => $query->createNamedParameter(time()),
+                'etag' => $query->createNamedParameter(md5($objectData)),
+                'size' => $query->createNamedParameter(strlen($objectData))
+            ])
+            ->executeStatement();
+    }
+
+    /**
+     * Adds a change record to the calendarchanges table.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param int $operation 1 = add, 2 = modify, 3 = delete.
+     * @param int $calendarType
+     * @return void
+     */
+    protected function addChange($calendarId, $objectUri, $operation, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+        $table = $calendarType === self::CALENDAR_TYPE_CALENDAR ? 'calendars': 'calendarsubscriptions';
+
+        $query = $this->db->getQueryBuilder();
+        $query->select('synctoken')
+            ->from($table)
+            ->where($query->expr()->eq('id', $query->createNamedParameter($calendarId)));
+        $result = $query->executeQuery();
+        $syncToken = (int)$result->fetchOne();
+        $result->closeCursor();
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendarchanges')
+            ->values([
+                'uri' => $query->createNamedParameter($objectUri),
+                'synctoken' => $query->createNamedParameter($syncToken),
+                'calendarid' => $query->createNamedParameter($calendarId),
+                'operation' => $query->createNamedParameter($operation),
+                'calendartype' => $query->createNamedParameter($calendarType),
+            ])
+            ->executeStatement();
+
+        $stmt = $this->db->prepare("UPDATE `*PREFIX*$table` SET `synctoken` = `synctoken` + 1 WHERE `id` = ?");
+        $stmt->execute([
+            $calendarId
+        ]);
+    }
+
+    /**
+     * Parses some information from calendar objects, used for optimized
+     * calendar-queries.
+     *
+     * Returns an array with the following keys:
+     *   * etag - An md5 checksum of the object without the quotes.
+     *   * size - Size of the object in bytes
+     *   * componentType - VEVENT, VTODO or VJOURNAL
+     *   * firstOccurence
+     *   * lastOccurence
+     *   * uid - value of the UID property
+     *
+     * @param string $calendarData
+     * @return array
+     */
+    public function getDenormalizedData($calendarData) {
+        $vObject = Reader::read($calendarData);
+        $vEvents = [];
+        $componentType = null;
+        $component = null;
+        $firstOccurrence = null;
+        $lastOccurrence = null;
+        $uid = null;
+        $classification = self::CLASSIFICATION_PUBLIC;
+        $hasDTSTART = false;
+        foreach ($vObject->getComponents() as $component) {
+            if ($component->name !== 'VTIMEZONE') {
+                // Finding all VEVENTs, and track them
+                if ($component->name === 'VEVENT') {
+                    array_push($vEvents, $component);
+                    if ($component->DTSTART) {
+                        $hasDTSTART = true;
+                    }
+                }
+                // Track first component type and uid
+                if ($uid === null) {
+                    $componentType = $component->name;
+                    $uid = (string)$component->UID;
+                }
+            }
+        }
+        if (!$componentType) {
+            throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
+        }
+
+        if ($hasDTSTART) {
+            $component = $vEvents[0];
+
+            // Finding the last occurrence is a bit harder
+            if (!isset($component->RRULE) && count($vEvents) === 1) {
+                $firstOccurrence = $component->DTSTART->getDateTime()->getTimeStamp();
+                if (isset($component->DTEND)) {
+                    $lastOccurrence = $component->DTEND->getDateTime()->getTimeStamp();
+                } elseif (isset($component->DURATION)) {
+                    $endDate = clone $component->DTSTART->getDateTime();
+                    $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
+                    $lastOccurrence = $endDate->getTimeStamp();
+                } elseif (!$component->DTSTART->hasTime()) {
+                    $endDate = clone $component->DTSTART->getDateTime();
+                    $endDate->modify('+1 day');
+                    $lastOccurrence = $endDate->getTimeStamp();
+                } else {
+                    $lastOccurrence = $firstOccurrence;
+                }
+            } else {
+                $it = new EventIterator($vEvents);
+                $maxDate = new DateTime(self::MAX_DATE);
+                $firstOccurrence = $it->getDtStart()->getTimestamp();
+                if ($it->isInfinite()) {
+                    $lastOccurrence = $maxDate->getTimestamp();
+                } else {
+                    $end = $it->getDtEnd();
+                    while ($it->valid() && $end < $maxDate) {
+                        $end = $it->getDtEnd();
+                        $it->next();
+                    }
+                    $lastOccurrence = $end->getTimestamp();
+                }
+            }
+        }
+
+        if ($component->CLASS) {
+            $classification = CalDavBackend::CLASSIFICATION_PRIVATE;
+            switch ($component->CLASS->getValue()) {
+                case 'PUBLIC':
+                    $classification = CalDavBackend::CLASSIFICATION_PUBLIC;
+                    break;
+                case 'CONFIDENTIAL':
+                    $classification = CalDavBackend::CLASSIFICATION_CONFIDENTIAL;
+                    break;
+            }
+        }
+        return [
+            'etag' => md5($calendarData),
+            'size' => strlen($calendarData),
+            'componentType' => $componentType,
+            'firstOccurence' => is_null($firstOccurrence) ? null : max(0, $firstOccurrence),
+            'lastOccurence' => $lastOccurrence,
+            'uid' => $uid,
+            'classification' => $classification
+        ];
+    }
+
+    /**
+     * @param $cardData
+     * @return bool|string
+     */
+    private function readBlob($cardData) {
+        if (is_resource($cardData)) {
+            return stream_get_contents($cardData);
+        }
+
+        return $cardData;
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param array $add
+     * @param array $remove
+     */
+    public function updateShares($shareable, $add, $remove) {
+        $calendarId = $shareable->getResourceId();
+        $calendarRow = $this->getCalendarById($calendarId);
+        $oldShares = $this->getShares($calendarId);
+
+        $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::updateShares', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::updateShares',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $calendarRow,
+                'shares' => $oldShares,
+                'add' => $add,
+                'remove' => $remove,
+            ]));
+        $this->calendarSharingBackend->updateShares($shareable, $add, $remove);
+
+        $this->dispatcher->dispatchTyped(new CalendarShareUpdatedEvent((int)$calendarId, $calendarRow, $oldShares, $add, $remove));
+    }
+
+    /**
+     * @param int $resourceId
+     * @param int $calendarType
+     * @return array
+     */
+    public function getShares($resourceId, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+        return $this->calendarSharingBackend->getShares($resourceId);
+    }
+
+    /**
+     * @param boolean $value
+     * @param \OCA\DAV\CalDAV\Calendar $calendar
+     * @return string|null
+     */
+    public function setPublishStatus($value, $calendar) {
+        $calendarId = $calendar->getResourceId();
+        $calendarData = $this->getCalendarById($calendarId);
+        $this->legacyDispatcher->dispatch('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', new GenericEvent(
+            '\OCA\DAV\CalDAV\CalDavBackend::updateShares',
+            [
+                'calendarId' => $calendarId,
+                'calendarData' => $calendarData,
+                'public' => $value,
+            ]));
+
+        $query = $this->db->getQueryBuilder();
+        if ($value) {
+            $publicUri = $this->random->generate(16, ISecureRandom::CHAR_HUMAN_READABLE);
+            $query->insert('dav_shares')
+                ->values([
+                    'principaluri' => $query->createNamedParameter($calendar->getPrincipalURI()),
+                    'type' => $query->createNamedParameter('calendar'),
+                    'access' => $query->createNamedParameter(self::ACCESS_PUBLIC),
+                    'resourceid' => $query->createNamedParameter($calendar->getResourceId()),
+                    'publicuri' => $query->createNamedParameter($publicUri)
+                ]);
+            $query->executeStatement();
+
+            $this->dispatcher->dispatchTyped(new CalendarPublishedEvent((int)$calendarId, $calendarData, $publicUri));
+            return $publicUri;
+        }
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
+            ->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)));
+        $query->executeStatement();
+
+        $this->dispatcher->dispatchTyped(new CalendarUnpublishedEvent((int)$calendarId, $calendarData));
+        return null;
+    }
+
+    /**
+     * @param \OCA\DAV\CalDAV\Calendar $calendar
+     * @return mixed
+     */
+    public function getPublishStatus($calendar) {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select('publicuri')
+            ->from('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($calendar->getResourceId())))
+            ->andWhere($query->expr()->eq('access', $query->createNamedParameter(self::ACCESS_PUBLIC)))
+            ->executeQuery();
+
+        $row = $result->fetch();
+        $result->closeCursor();
+        return $row ? reset($row) : false;
+    }
+
+    /**
+     * @param int $resourceId
+     * @param array $acl
+     * @return array
+     */
+    public function applyShareAcl($resourceId, $acl) {
+        return $this->calendarSharingBackend->applyShareAcl($resourceId, $acl);
+    }
+
+
+
+    /**
+     * update properties table
+     *
+     * @param int $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @param int $calendarType
+     */
+    public function updateProperties($calendarId, $objectUri, $calendarData, $calendarType = self::CALENDAR_TYPE_CALENDAR) {
+        $objectId = $this->getCalendarObjectId($calendarId, $objectUri, $calendarType);
+
+        try {
+            $vCalendar = $this->readCalendarData($calendarData);
+        } catch (\Exception $ex) {
+            return;
+        }
+
+        $this->purgeProperties($calendarId, $objectId);
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert($this->dbObjectPropertiesTable)
+            ->values(
+                [
+                    'calendarid' => $query->createNamedParameter($calendarId),
+                    'calendartype' => $query->createNamedParameter($calendarType),
+                    'objectid' => $query->createNamedParameter($objectId),
+                    'name' => $query->createParameter('name'),
+                    'parameter' => $query->createParameter('parameter'),
+                    'value' => $query->createParameter('value'),
+                ]
+            );
+
+        $indexComponents = ['VEVENT', 'VJOURNAL', 'VTODO'];
+        foreach ($vCalendar->getComponents() as $component) {
+            if (!in_array($component->name, $indexComponents)) {
+                continue;
+            }
+
+            foreach ($component->children() as $property) {
+                if (in_array($property->name, self::$indexProperties)) {
+                    $value = $property->getValue();
+                    // is this a shitty db?
+                    if (!$this->db->supports4ByteText()) {
+                        $value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
+                    }
+                    $value = mb_strcut($value, 0, 254);
+
+                    $query->setParameter('name', $property->name);
+                    $query->setParameter('parameter', null);
+                    $query->setParameter('value', $value);
+                    $query->executeStatement();
+                }
+
+                if (array_key_exists($property->name, self::$indexParameters)) {
+                    $parameters = $property->parameters();
+                    $indexedParametersForProperty = self::$indexParameters[$property->name];
+
+                    foreach ($parameters as $key => $value) {
+                        if (in_array($key, $indexedParametersForProperty)) {
+                            // is this a shitty db?
+                            if ($this->db->supports4ByteText()) {
+                                $value = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $value);
+                            }
+
+                            $query->setParameter('name', $property->name);
+                            $query->setParameter('parameter', mb_strcut($key, 0, 254));
+                            $query->setParameter('value', mb_strcut($value, 0, 254));
+                            $query->executeStatement();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * deletes all birthday calendars
+     */
+    public function deleteAllBirthdayCalendars() {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['id'])->from('calendars')
+            ->where($query->expr()->eq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)))
+            ->executeQuery();
+
+        $ids = $result->fetchAll();
+        foreach ($ids as $id) {
+            $this->deleteCalendar($id['id']);
+        }
+    }
+
+    /**
+     * @param $subscriptionId
+     */
+    public function purgeAllCachedEventsForSubscription($subscriptionId) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('uri')
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));
+        $stmt = $query->executeQuery();
+
+        $uris = [];
+        foreach ($stmt->fetchAll() as $row) {
+            $uris[] = $row['uri'];
+        }
+        $stmt->closeCursor();
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('calendarobjects')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->executeStatement();
+
+        $query->delete('calendarchanges')
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->executeStatement();
+
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('calendarid', $query->createNamedParameter($subscriptionId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)))
+            ->executeStatement();
+
+        foreach ($uris as $uri) {
+            $this->addChange($subscriptionId, $uri, 3, self::CALENDAR_TYPE_SUBSCRIPTION);
+        }
+    }
+
+    /**
+     * Move a calendar from one user to another
+     *
+     * @param string $uriName
+     * @param string $uriOrigin
+     * @param string $uriDestination
+     * @param string $newUriName (optional) the new uriName
+     */
+    public function moveCalendar($uriName, $uriOrigin, $uriDestination, $newUriName = null) {
+        $query = $this->db->getQueryBuilder();
+        $query->update('calendars')
+            ->set('principaluri', $query->createNamedParameter($uriDestination))
+            ->set('uri', $query->createNamedParameter($newUriName ?: $uriName))
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($uriOrigin)))
+            ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($uriName)))
+            ->executeStatement();
+    }
+
+    /**
+     * read VCalendar data into a VCalendar object
+     *
+     * @param string $objectData
+     * @return VCalendar
+     */
+    protected function readCalendarData($objectData) {
+        return Reader::read($objectData);
+    }
+
+    /**
+     * delete all properties from a given calendar object
+     *
+     * @param int $calendarId
+     * @param int $objectId
+     */
+    protected function purgeProperties($calendarId, $objectId) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete($this->dbObjectPropertiesTable)
+            ->where($query->expr()->eq('objectid', $query->createNamedParameter($objectId)))
+            ->andWhere($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)));
+        $query->executeStatement();
+    }
+
+    /**
+     * get ID from a given calendar object
+     *
+     * @param int $calendarId
+     * @param string $uri
+     * @param int $calendarType
+     * @return int
+     */
+    protected function getCalendarObjectId($calendarId, $uri, $calendarType):int {
+        $query = $this->db->getQueryBuilder();
+        $query->select('id')
+            ->from('calendarobjects')
+            ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
+            ->andWhere($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId)))
+            ->andWhere($query->expr()->eq('calendartype', $query->createNamedParameter($calendarType)));
+
+        $result = $query->executeQuery();
+        $objectIds = $result->fetch();
+        $result->closeCursor();
+
+        if (!isset($objectIds['id'])) {
+            throw new \InvalidArgumentException('Calendarobject does not exists: ' . $uri);
+        }
+
+        return (int)$objectIds['id'];
+    }
+
+    /**
+     * return legacy endpoint principal name to new principal name
+     *
+     * @param $principalUri
+     * @param $toV2
+     * @return string
+     */
+    private function convertPrincipal($principalUri, $toV2) {
+        if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
+            [, $name] = Uri\split($principalUri);
+            if ($toV2 === true) {
+                return "principals/users/$name";
+            }
+            return "principals/$name";
+        }
+        return $principalUri;
+    }
+
+    /**
+     * adds information about an owner to the calendar data
+     *
+     * @param $calendarInfo
+     */
+    private function addOwnerPrincipal(&$calendarInfo) {
+        $ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
+        $displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
+        if (isset($calendarInfo[$ownerPrincipalKey])) {
+            $uri = $calendarInfo[$ownerPrincipalKey];
+        } else {
+            $uri = $calendarInfo['principaluri'];
+        }
+
+        $principalInformation = $this->principalBackend->getPrincipalByPath($uri);
+        if (isset($principalInformation['{DAV:}displayname'])) {
+            $calendarInfo[$displaynameKey] = $principalInformation['{DAV:}displayname'];
+        }
+    }
 }

apps/files_trashbin/lib/Trashbin.php

Indentation +1063 added lines, -1063 removed lines

@@ -64,1067 +64,1067 @@
 
 class Trashbin {
 
-	// unit: percentage; 50% of available disk space/quota
-	public const DEFAULTMAXSIZE = 50;
-
-	/**
-	 * Whether versions have already be rescanned during this PHP request
-	 *
-	 * @var bool
-	 */
-	private static $scannedVersions = false;
-
-	/**
-	 * Ensure we don't need to scan the file during the move to trash
-	 * by triggering the scan in the pre-hook
-	 *
-	 * @param array $params
-	 */
-	public static function ensureFileScannedHook($params) {
-		try {
-			self::getUidAndFilename($params['path']);
-		} catch (NotFoundException $e) {
-			// nothing to scan for non existing files
-		}
-	}
-
-	/**
-	 * get the UID of the owner of the file and the path to the file relative to
-	 * owners files folder
-	 *
-	 * @param string $filename
-	 * @return array
-	 * @throws \OC\User\NoUserException
-	 */
-	public static function getUidAndFilename($filename) {
-		$uid = Filesystem::getOwner($filename);
-		$userManager = \OC::$server->getUserManager();
-		// if the user with the UID doesn't exists, e.g. because the UID points
-		// to a remote user with a federated cloud ID we use the current logged-in
-		// user. We need a valid local user to move the file to the right trash bin
-		if (!$userManager->userExists($uid)) {
-			$uid = User::getUser();
-		}
-		if (!$uid) {
-			// no owner, usually because of share link from ext storage
-			return [null, null];
-		}
-		Filesystem::initMountPoints($uid);
-		if ($uid !== User::getUser()) {
-			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/' . $uid . '/files');
-			try {
-				$filename = $ownerView->getPath($info['fileid']);
-			} catch (NotFoundException $e) {
-				$filename = null;
-			}
-		}
-		return [$uid, $filename];
-	}
-
-	/**
-	 * get original location of files for user
-	 *
-	 * @param string $user
-	 * @return array (filename => array (timestamp => original location))
-	 */
-	public static function getLocations($user) {
-		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$query->select('id', 'timestamp', 'location')
-			->from('files_trash')
-			->where($query->expr()->eq('user', $query->createNamedParameter($user)));
-		$result = $query->executeQuery();
-		$array = [];
-		while ($row = $result->fetch()) {
-			if (isset($array[$row['id']])) {
-				$array[$row['id']][$row['timestamp']] = $row['location'];
-			} else {
-				$array[$row['id']] = [$row['timestamp'] => $row['location']];
-			}
-		}
-		$result->closeCursor();
-		return $array;
-	}
-
-	/**
-	 * get original location of file
-	 *
-	 * @param string $user
-	 * @param string $filename
-	 * @param string $timestamp
-	 * @return string original location
-	 */
-	public static function getLocation($user, $filename, $timestamp) {
-		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$query->select('location')
-			->from('files_trash')
-			->where($query->expr()->eq('user', $query->createNamedParameter($user)))
-			->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
-			->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
-
-		$result = $query->executeQuery();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if (isset($row['location'])) {
-			return $row['location'];
-		} else {
-			return false;
-		}
-	}
-
-	private static function setUpTrash($user) {
-		$view = new View('/' . $user);
-		if (!$view->is_dir('files_trashbin')) {
-			$view->mkdir('files_trashbin');
-		}
-		if (!$view->is_dir('files_trashbin/files')) {
-			$view->mkdir('files_trashbin/files');
-		}
-		if (!$view->is_dir('files_trashbin/versions')) {
-			$view->mkdir('files_trashbin/versions');
-		}
-		if (!$view->is_dir('files_trashbin/keys')) {
-			$view->mkdir('files_trashbin/keys');
-		}
-	}
-
-
-	/**
-	 * copy file to owners trash
-	 *
-	 * @param string $sourcePath
-	 * @param string $owner
-	 * @param string $targetPath
-	 * @param $user
-	 * @param integer $timestamp
-	 */
-	private static function copyFilesToUser($sourcePath, $owner, $targetPath, $user, $timestamp) {
-		self::setUpTrash($owner);
-
-		$targetFilename = basename($targetPath);
-		$targetLocation = dirname($targetPath);
-
-		$sourceFilename = basename($sourcePath);
-
-		$view = new View('/');
-
-		$target = $user . '/files_trashbin/files/' . $targetFilename . '.d' . $timestamp;
-		$source = $owner . '/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp;
-		$free = $view->free_space($target);
-		$isUnknownOrUnlimitedFreeSpace = $free < 0;
-		$isEnoughFreeSpaceLeft = $view->filesize($source) < $free;
-		if ($isUnknownOrUnlimitedFreeSpace || $isEnoughFreeSpaceLeft) {
-			self::copy_recursive($source, $target, $view);
-		}
-
-
-		if ($view->file_exists($target)) {
-			$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-			$query->insert('files_trash')
-				->setValue('id', $query->createNamedParameter($targetFilename))
-				->setValue('timestamp', $query->createNamedParameter($timestamp))
-				->setValue('location', $query->createNamedParameter($targetLocation))
-				->setValue('user', $query->createNamedParameter($user));
-			$result = $query->executeStatement();
-			if (!$result) {
-				\OC::$server->getLogger()->error('trash bin database couldn\'t be updated for the files owner', ['app' => 'files_trashbin']);
-			}
-		}
-	}
-
-
-	/**
-	 * move file to the trash bin
-	 *
-	 * @param string $file_path path to the deleted file/directory relative to the files root directory
-	 * @param bool $ownerOnly delete for owner only (if file gets moved out of a shared folder)
-	 *
-	 * @return bool
-	 */
-	public static function move2trash($file_path, $ownerOnly = false) {
-		// get the user for which the filesystem is setup
-		$root = Filesystem::getRoot();
-		[, $user] = explode('/', $root);
-		[$owner, $ownerPath] = self::getUidAndFilename($file_path);
-
-		// if no owner found (ex: ext storage + share link), will use the current user's trashbin then
-		if (is_null($owner)) {
-			$owner = $user;
-			$ownerPath = $file_path;
-		}
-
-		$ownerView = new View('/' . $owner);
-		// file has been deleted in between
-		if (is_null($ownerPath) || $ownerPath === '' || !$ownerView->file_exists('/files/' . $ownerPath)) {
-			return true;
-		}
-
-		self::setUpTrash($user);
-		if ($owner !== $user) {
-			// also setup for owner
-			self::setUpTrash($owner);
-		}
-
-		$path_parts = pathinfo($ownerPath);
-
-		$filename = $path_parts['basename'];
-		$location = $path_parts['dirname'];
-		/** @var ITimeFactory $timeFactory */
-		$timeFactory = \OC::$server->query(ITimeFactory::class);
-		$timestamp = $timeFactory->getTime();
-
-		$lockingProvider = \OC::$server->getLockingProvider();
-
-		// disable proxy to prevent recursive calls
-		$trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp;
-		$gotLock = false;
-
-		while (!$gotLock) {
-			try {
-				/** @var \OC\Files\Storage\Storage $trashStorage */
-				[$trashStorage, $trashInternalPath] = $ownerView->resolvePath($trashPath);
-
-				$trashStorage->acquireLock($trashInternalPath, ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
-				$gotLock = true;
-			} catch (LockedException $e) {
-				// a file with the same name is being deleted concurrently
-				// nudge the timestamp a bit to resolve the conflict
-
-				$timestamp = $timestamp + 1;
-
-				$trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp;
-			}
-		}
-
-		/** @var \OC\Files\Storage\Storage $sourceStorage */
-		[$sourceStorage, $sourceInternalPath] = $ownerView->resolvePath('/files/' . $ownerPath);
-
-
-		if ($trashStorage->file_exists($trashInternalPath)) {
-			$trashStorage->unlink($trashInternalPath);
-		}
-
-		$config = \OC::$server->getConfig();
-		$systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
-		$userTrashbinSize = (int)$config->getUserValue($owner, 'files_trashbin', 'trashbin_size', '-1');
-		$configuredTrashbinSize = ($userTrashbinSize < 0) ? $systemTrashbinSize : $userTrashbinSize;
-		if ($configuredTrashbinSize >= 0 && $sourceStorage->filesize($sourceInternalPath) >= $configuredTrashbinSize) {
-			return false;
-		}
-
-		$trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
-
-		try {
-			$moveSuccessful = true;
-
-			// when moving within the same object store, the cache update done above is enough to move the file
-			if (!($trashStorage->instanceOfStorage(ObjectStoreStorage::class) && $trashStorage->getId() === $sourceStorage->getId())) {
-				$trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
-			}
-		} catch (\OCA\Files_Trashbin\Exceptions\CopyRecursiveException $e) {
-			$moveSuccessful = false;
-			if ($trashStorage->file_exists($trashInternalPath)) {
-				$trashStorage->unlink($trashInternalPath);
-			}
-			\OC::$server->getLogger()->error('Couldn\'t move ' . $file_path . ' to the trash bin', ['app' => 'files_trashbin']);
-		}
-
-		if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort
-			if ($sourceStorage->is_dir($sourceInternalPath)) {
-				$sourceStorage->rmdir($sourceInternalPath);
-			} else {
-				$sourceStorage->unlink($sourceInternalPath);
-			}
-
-			if ($sourceStorage->file_exists($sourceInternalPath)) {
-				// undo the cache move
-				$sourceStorage->getUpdater()->renameFromStorage($trashStorage, $trashInternalPath, $sourceInternalPath);
-			} else {
-				$trashStorage->getUpdater()->remove($trashInternalPath);
-			}
-			return false;
-		}
-
-		if ($moveSuccessful) {
-			$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-			$query->insert('files_trash')
-				->setValue('id', $query->createNamedParameter($filename))
-				->setValue('timestamp', $query->createNamedParameter($timestamp))
-				->setValue('location', $query->createNamedParameter($location))
-				->setValue('user', $query->createNamedParameter($owner));
-			$result = $query->executeStatement();
-			if (!$result) {
-				\OC::$server->getLogger()->error('trash bin database couldn\'t be updated', ['app' => 'files_trashbin']);
-			}
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', ['filePath' => Filesystem::normalizePath($file_path),
-				'trashPath' => Filesystem::normalizePath($filename . '.d' . $timestamp)]);
-
-			self::retainVersions($filename, $owner, $ownerPath, $timestamp);
-
-			// if owner !== user we need to also add a copy to the users trash
-			if ($user !== $owner && $ownerOnly === false) {
-				self::copyFilesToUser($ownerPath, $owner, $file_path, $user, $timestamp);
-			}
-		}
-
-		$trashStorage->releaseLock($trashInternalPath, ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
-
-		self::scheduleExpire($user);
-
-		// if owner !== user we also need to update the owners trash size
-		if ($owner !== $user) {
-			self::scheduleExpire($owner);
-		}
-
-		return $moveSuccessful;
-	}
-
-	/**
-	 * Move file versions to trash so that they can be restored later
-	 *
-	 * @param string $filename of deleted file
-	 * @param string $owner owner user id
-	 * @param string $ownerPath path relative to the owner's home storage
-	 * @param integer $timestamp when the file was deleted
-	 */
-	private static function retainVersions($filename, $owner, $ownerPath, $timestamp) {
-		if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) {
-			$user = User::getUser();
-			$rootView = new View('/');
-
-			if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
-				if ($owner !== $user) {
-					self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . basename($ownerPath) . '.d' . $timestamp, $rootView);
-				}
-				self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp);
-			} elseif ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
-				foreach ($versions as $v) {
-					if ($owner !== $user) {
-						self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . $v['name'] . '.v' . $v['version'] . '.d' . $timestamp);
-					}
-					self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Move a file or folder on storage level
-	 *
-	 * @param View $view
-	 * @param string $source
-	 * @param string $target
-	 * @return bool
-	 */
-	private static function move(View $view, $source, $target) {
-		/** @var \OC\Files\Storage\Storage $sourceStorage */
-		[$sourceStorage, $sourceInternalPath] = $view->resolvePath($source);
-		/** @var \OC\Files\Storage\Storage $targetStorage */
-		[$targetStorage, $targetInternalPath] = $view->resolvePath($target);
-		/** @var \OC\Files\Storage\Storage $ownerTrashStorage */
-
-		$result = $targetStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		if ($result) {
-			$targetStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		}
-		return $result;
-	}
-
-	/**
-	 * Copy a file or folder on storage level
-	 *
-	 * @param View $view
-	 * @param string $source
-	 * @param string $target
-	 * @return bool
-	 */
-	private static function copy(View $view, $source, $target) {
-		/** @var \OC\Files\Storage\Storage $sourceStorage */
-		[$sourceStorage, $sourceInternalPath] = $view->resolvePath($source);
-		/** @var \OC\Files\Storage\Storage $targetStorage */
-		[$targetStorage, $targetInternalPath] = $view->resolvePath($target);
-		/** @var \OC\Files\Storage\Storage $ownerTrashStorage */
-
-		$result = $targetStorage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		if ($result) {
-			$targetStorage->getUpdater()->update($targetInternalPath);
-		}
-		return $result;
-	}
-
-	/**
-	 * Restore a file or folder from trash bin
-	 *
-	 * @param string $file path to the deleted file/folder relative to "files_trashbin/files/",
-	 * including the timestamp suffix ".d12345678"
-	 * @param string $filename name of the file/folder
-	 * @param int $timestamp time when the file/folder was deleted
-	 *
-	 * @return bool true on success, false otherwise
-	 */
-	public static function restore($file, $filename, $timestamp) {
-		$user = User::getUser();
-		$view = new View('/' . $user);
-
-		$location = '';
-		if ($timestamp) {
-			$location = self::getLocation($user, $filename, $timestamp);
-			if ($location === false) {
-				\OC::$server->getLogger()->error('trash bin database inconsistent! ($user: ' . $user . ' $filename: ' . $filename . ', $timestamp: ' . $timestamp . ')', ['app' => 'files_trashbin']);
-			} else {
-				// if location no longer exists, restore file in the root directory
-				if ($location !== '/' &&
-					(!$view->is_dir('files/' . $location) ||
-						!$view->isCreatable('files/' . $location))
-				) {
-					$location = '';
-				}
-			}
-		}
-
-		// we need a  extension in case a file/dir with the same name already exists
-		$uniqueFilename = self::getUniqueFilename($location, $filename, $view);
-
-		$source = Filesystem::normalizePath('files_trashbin/files/' . $file);
-		$target = Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
-		if (!$view->file_exists($source)) {
-			return false;
-		}
-		$mtime = $view->filemtime($source);
-
-		// restore file
-		if (!$view->isCreatable(dirname($target))) {
-			throw new NotPermittedException("Can't restore trash item because the target folder is not writable");
-		}
-		$restoreResult = $view->rename($source, $target);
-
-		// handle the restore result
-		if ($restoreResult) {
-			$fakeRoot = $view->getRoot();
-			$view->chroot('/' . $user . '/files');
-			$view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
-			$view->chroot($fakeRoot);
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', ['filePath' => Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename),
-				'trashPath' => Filesystem::normalizePath($file)]);
-
-			self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
-
-			if ($timestamp) {
-				$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-				$query->delete('files_trash')
-					->where($query->expr()->eq('user', $query->createNamedParameter($user)))
-					->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
-					->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
-				$query->executeStatement();
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * restore versions from trash bin
-	 *
-	 * @param View $view file view
-	 * @param string $file complete path to file
-	 * @param string $filename name of file once it was deleted
-	 * @param string $uniqueFilename new file name to restore the file without overwriting existing files
-	 * @param string $location location if file
-	 * @param int $timestamp deletion time
-	 * @return false|null
-	 */
-	private static function restoreVersions(View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
-		if (\OCP\App::isEnabled('files_versions')) {
-			$user = User::getUser();
-			$rootView = new View('/');
-
-			$target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
-
-			[$owner, $ownerPath] = self::getUidAndFilename($target);
-
-			// file has been deleted in between
-			if (empty($ownerPath)) {
-				return false;
-			}
-
-			if ($timestamp) {
-				$versionedFile = $filename;
-			} else {
-				$versionedFile = $file;
-			}
-
-			if ($view->is_dir('/files_trashbin/versions/' . $file)) {
-				$rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
-			} elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
-				foreach ($versions as $v) {
-					if ($timestamp) {
-						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
-					} else {
-						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * delete all files from the trash
-	 */
-	public static function deleteAll() {
-		$user = User::getUser();
-		$userRoot = \OC::$server->getUserFolder($user)->getParent();
-		$view = new View('/' . $user);
-		$fileInfos = $view->getDirectoryContent('files_trashbin/files');
-
-		try {
-			$trash = $userRoot->get('files_trashbin');
-		} catch (NotFoundException $e) {
-			return false;
-		}
-
-		// Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
-		$filePaths = [];
-		foreach ($fileInfos as $fileInfo) {
-			$filePaths[] = $view->getRelativePath($fileInfo->getPath());
-		}
-		unset($fileInfos); // save memory
-
-		// Bulk PreDelete-Hook
-		\OC_Hook::emit('\OCP\Trashbin', 'preDeleteAll', ['paths' => $filePaths]);
-
-		// Single-File Hooks
-		foreach ($filePaths as $path) {
-			self::emitTrashbinPreDelete($path);
-		}
-
-		// actual file deletion
-		$trash->delete();
-
-		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$query->delete('files_trash')
-			->where($query->expr()->eq('user', $query->createNamedParameter($user)));
-		$query->executeStatement();
-
-		// Bulk PostDelete-Hook
-		\OC_Hook::emit('\OCP\Trashbin', 'deleteAll', ['paths' => $filePaths]);
-
-		// Single-File Hooks
-		foreach ($filePaths as $path) {
-			self::emitTrashbinPostDelete($path);
-		}
-
-		$trash = $userRoot->newFolder('files_trashbin');
-		$trash->newFolder('files');
-
-		return true;
-	}
-
-	/**
-	 * wrapper function to emit the 'preDelete' hook of \OCP\Trashbin before a file is deleted
-	 *
-	 * @param string $path
-	 */
-	protected static function emitTrashbinPreDelete($path) {
-		\OC_Hook::emit('\OCP\Trashbin', 'preDelete', ['path' => $path]);
-	}
-
-	/**
-	 * wrapper function to emit the 'delete' hook of \OCP\Trashbin after a file has been deleted
-	 *
-	 * @param string $path
-	 */
-	protected static function emitTrashbinPostDelete($path) {
-		\OC_Hook::emit('\OCP\Trashbin', 'delete', ['path' => $path]);
-	}
-
-	/**
-	 * delete file from trash bin permanently
-	 *
-	 * @param string $filename path to the file
-	 * @param string $user
-	 * @param int $timestamp of deletion time
-	 *
-	 * @return int size of deleted files
-	 */
-	public static function delete($filename, $user, $timestamp = null) {
-		$userRoot = \OC::$server->getUserFolder($user)->getParent();
-		$view = new View('/' . $user);
-		$size = 0;
-
-		if ($timestamp) {
-			$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-			$query->delete('files_trash')
-				->where($query->expr()->eq('user', $query->createNamedParameter($user)))
-				->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
-				->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
-			$query->executeStatement();
-
-			$file = $filename . '.d' . $timestamp;
-		} else {
-			$file = $filename;
-		}
-
-		$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
-
-		try {
-			$node = $userRoot->get('/files_trashbin/files/' . $file);
-		} catch (NotFoundException $e) {
-			return $size;
-		}
-
-		if ($node instanceof Folder) {
-			$size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file));
-		} elseif ($node instanceof File) {
-			$size += $view->filesize('/files_trashbin/files/' . $file);
-		}
-
-		self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
-		$node->delete();
-		self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
-
-		return $size;
-	}
-
-	/**
-	 * @param View $view
-	 * @param string $file
-	 * @param string $filename
-	 * @param integer|null $timestamp
-	 * @param string $user
-	 * @return int
-	 */
-	private static function deleteVersions(View $view, $file, $filename, $timestamp, $user) {
-		$size = 0;
-		if (\OCP\App::isEnabled('files_versions')) {
-			if ($view->is_dir('files_trashbin/versions/' . $file)) {
-				$size += self::calculateSize(new View('/' . $user . '/files_trashbin/versions/' . $file));
-				$view->unlink('files_trashbin/versions/' . $file);
-			} elseif ($versions = self::getVersionsFromTrash($filename, $timestamp, $user)) {
-				foreach ($versions as $v) {
-					if ($timestamp) {
-						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
-						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
-					} else {
-						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
-						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
-					}
-				}
-			}
-		}
-		return $size;
-	}
-
-	/**
-	 * check to see whether a file exists in trashbin
-	 *
-	 * @param string $filename path to the file
-	 * @param int $timestamp of deletion time
-	 * @return bool true if file exists, otherwise false
-	 */
-	public static function file_exists($filename, $timestamp = null) {
-		$user = User::getUser();
-		$view = new View('/' . $user);
-
-		if ($timestamp) {
-			$filename = $filename . '.d' . $timestamp;
-		}
-
-		$target = Filesystem::normalizePath('files_trashbin/files/' . $filename);
-		return $view->file_exists($target);
-	}
-
-	/**
-	 * deletes used space for trash bin in db if user was deleted
-	 *
-	 * @param string $uid id of deleted user
-	 * @return bool result of db delete operation
-	 */
-	public static function deleteUser($uid) {
-		$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$query->delete('files_trash')
-			->where($query->expr()->eq('user', $query->createNamedParameter($uid)));
-		return (bool) $query->executeStatement();
-	}
-
-	/**
-	 * calculate remaining free space for trash bin
-	 *
-	 * @param integer $trashbinSize current size of the trash bin
-	 * @param string $user
-	 * @return int available free space for trash bin
-	 */
-	private static function calculateFreeSpace($trashbinSize, $user) {
-		$config = \OC::$server->getConfig();
-		$userTrashbinSize = (int)$config->getUserValue($user, 'files_trashbin', 'trashbin_size', '-1');
-		if ($userTrashbinSize > -1) {
-			return $userTrashbinSize - $trashbinSize;
-		}
-		$systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
-		if ($systemTrashbinSize > -1) {
-			return $systemTrashbinSize - $trashbinSize;
-		}
-
-		$softQuota = true;
-		$userObject = \OC::$server->getUserManager()->get($user);
-		if (is_null($userObject)) {
-			return 0;
-		}
-		$quota = $userObject->getQuota();
-		if ($quota === null || $quota === 'none') {
-			$quota = Filesystem::free_space('/');
-			$softQuota = false;
-			// inf or unknown free space
-			if ($quota < 0) {
-				$quota = PHP_INT_MAX;
-			}
-		} else {
-			$quota = \OCP\Util::computerFileSize($quota);
-		}
-
-		// calculate available space for trash bin
-		// subtract size of files and current trash bin size from quota
-		if ($softQuota) {
-			$userFolder = \OC::$server->getUserFolder($user);
-			if (is_null($userFolder)) {
-				return 0;
-			}
-			$free = $quota - $userFolder->getSize(false); // remaining free space for user
-			if ($free > 0) {
-				$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
-			} else {
-				$availableSpace = $free - $trashbinSize;
-			}
-		} else {
-			$availableSpace = $quota;
-		}
-
-		return $availableSpace;
-	}
-
-	/**
-	 * resize trash bin if necessary after a new file was added to Nextcloud
-	 *
-	 * @param string $user user id
-	 */
-	public static function resizeTrash($user) {
-		$size = self::getTrashbinSize($user);
-
-		$freeSpace = self::calculateFreeSpace($size, $user);
-
-		if ($freeSpace < 0) {
-			self::scheduleExpire($user);
-		}
-	}
-
-	/**
-	 * clean up the trash bin
-	 *
-	 * @param string $user
-	 */
-	public static function expire($user) {
-		$trashBinSize = self::getTrashbinSize($user);
-		$availableSpace = self::calculateFreeSpace($trashBinSize, $user);
-
-		$dirContent = Helper::getTrashFiles('/', $user, 'mtime');
-
-		// delete all files older then $retention_obligation
-		[$delSize, $count] = self::deleteExpiredFiles($dirContent, $user);
-
-		$availableSpace += $delSize;
-
-		// delete files from trash until we meet the trash bin size limit again
-		self::deleteFiles(array_slice($dirContent, $count), $user, $availableSpace);
-	}
-
-	/**
-	 * @param string $user
-	 */
-	private static function scheduleExpire($user) {
-		// let the admin disable auto expire
-		/** @var Application $application */
-		$application = \OC::$server->query(Application::class);
-		$expiration = $application->getContainer()->query('Expiration');
-		if ($expiration->isEnabled()) {
-			\OC::$server->getCommandBus()->push(new Expire($user));
-		}
-	}
-
-	/**
-	 * if the size limit for the trash bin is reached, we delete the oldest
-	 * files in the trash bin until we meet the limit again
-	 *
-	 * @param array $files
-	 * @param string $user
-	 * @param int $availableSpace available disc space
-	 * @return int size of deleted files
-	 */
-	protected static function deleteFiles($files, $user, $availableSpace) {
-		/** @var Application $application */
-		$application = \OC::$server->query(Application::class);
-		$expiration = $application->getContainer()->query('Expiration');
-		$size = 0;
-
-		if ($availableSpace < 0) {
-			foreach ($files as $file) {
-				if ($availableSpace < 0 && $expiration->isExpired($file['mtime'], true)) {
-					$tmp = self::delete($file['name'], $user, $file['mtime']);
-					\OC::$server->getLogger()->info('remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota)', ['app' => 'files_trashbin']);
-					$availableSpace += $tmp;
-					$size += $tmp;
-				} else {
-					break;
-				}
-			}
-		}
-		return $size;
-	}
-
-	/**
-	 * delete files older then max storage time
-	 *
-	 * @param array $files list of files sorted by mtime
-	 * @param string $user
-	 * @return integer[] size of deleted files and number of deleted files
-	 */
-	public static function deleteExpiredFiles($files, $user) {
-		/** @var Expiration $expiration */
-		$expiration = \OC::$server->query(Expiration::class);
-		$size = 0;
-		$count = 0;
-		foreach ($files as $file) {
-			$timestamp = $file['mtime'];
-			$filename = $file['name'];
-			if ($expiration->isExpired($timestamp)) {
-				try {
-					$size += self::delete($filename, $user, $timestamp);
-					$count++;
-				} catch (\OCP\Files\NotPermittedException $e) {
-					\OC::$server->getLogger()->logException($e, ['app' => 'files_trashbin', 'level' => \OCP\ILogger::WARN, 'message' => 'Removing "' . $filename . '" from trashbin failed.']);
-				}
-				\OC::$server->getLogger()->info(
-					'Remove "' . $filename . '" from trashbin because it exceeds max retention obligation term.',
-					['app' => 'files_trashbin']
-				);
-			} else {
-				break;
-			}
-		}
-
-		return [$size, $count];
-	}
-
-	/**
-	 * recursive copy to copy a whole directory
-	 *
-	 * @param string $source source path, relative to the users files directory
-	 * @param string $destination destination path relative to the users root directoy
-	 * @param View $view file view for the users root directory
-	 * @return int
-	 * @throws Exceptions\CopyRecursiveException
-	 */
-	private static function copy_recursive($source, $destination, View $view) {
-		$size = 0;
-		if ($view->is_dir($source)) {
-			$view->mkdir($destination);
-			$view->touch($destination, $view->filemtime($source));
-			foreach ($view->getDirectoryContent($source) as $i) {
-				$pathDir = $source . '/' . $i['name'];
-				if ($view->is_dir($pathDir)) {
-					$size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
-				} else {
-					$size += $view->filesize($pathDir);
-					$result = $view->copy($pathDir, $destination . '/' . $i['name']);
-					if (!$result) {
-						throw new \OCA\Files_Trashbin\Exceptions\CopyRecursiveException();
-					}
-					$view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir));
-				}
-			}
-		} else {
-			$size += $view->filesize($source);
-			$result = $view->copy($source, $destination);
-			if (!$result) {
-				throw new \OCA\Files_Trashbin\Exceptions\CopyRecursiveException();
-			}
-			$view->touch($destination, $view->filemtime($source));
-		}
-		return $size;
-	}
-
-	/**
-	 * find all versions which belong to the file we want to restore
-	 *
-	 * @param string $filename name of the file which should be restored
-	 * @param int $timestamp timestamp when the file was deleted
-	 * @return array
-	 */
-	private static function getVersionsFromTrash($filename, $timestamp, $user) {
-		$view = new View('/' . $user . '/files_trashbin/versions');
-		$versions = [];
-
-		/** @var \OC\Files\Storage\Storage $storage */
-		[$storage,] = $view->resolvePath('/');
-
-		//force rescan of versions, local storage may not have updated the cache
-		if (!self::$scannedVersions) {
-			$storage->getScanner()->scan('files_trashbin/versions');
-			self::$scannedVersions = true;
-		}
-
-		$pattern = \OC::$server->getDatabaseConnection()->escapeLikeParameter(basename($filename));
-		if ($timestamp) {
-			// fetch for old versions
-			$escapedTimestamp = \OC::$server->getDatabaseConnection()->escapeLikeParameter($timestamp);
-			$pattern .= '.v%.d' . $escapedTimestamp;
-			$offset = -strlen($escapedTimestamp) - 2;
-		} else {
-			$pattern .= '.v%';
-		}
-
-		// Manually fetch all versions from the file cache to be able to filter them by their parent
-		$cache = $storage->getCache('');
-		$query = new CacheQueryBuilder(
-			\OC::$server->getDatabaseConnection(),
-			\OC::$server->getSystemConfig(),
-			\OC::$server->getLogger(),
-			$cache
-		);
-		$normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/'. $filename)), '/');
-		$parentId = $cache->getId($normalizedParentPath);
-		if ($parentId === -1) {
-			return [];
-		}
-
-		$query->selectFileCache()
-			->whereStorageId()
-			->andWhere($query->expr()->eq('parent', $query->createNamedParameter($parentId)))
-			->andWhere($query->expr()->iLike('name', $query->createNamedParameter($pattern)));
-
-		$result = $query->executeQuery();
-		$entries = $result->fetchAll();
-		$result->closeCursor();
-
-		/** @var CacheEntry[] $matches */
-		$matches = array_map(function (array $data) {
-			return Cache::cacheEntryFromData($data, \OC::$server->getMimeTypeLoader());
-		}, $entries);
-
-		foreach ($matches as $ma) {
-			if ($timestamp) {
-				$parts = explode('.v', substr($ma['path'], 0, $offset));
-				$versions[] = end($parts);
-			} else {
-				$parts = explode('.v', $ma['path']);
-				$versions[] = end($parts);
-			}
-		}
-
-		return $versions;
-	}
-
-	/**
-	 * find unique extension for restored file if a file with the same name already exists
-	 *
-	 * @param string $location where the file should be restored
-	 * @param string $filename name of the file
-	 * @param View $view filesystem view relative to users root directory
-	 * @return string with unique extension
-	 */
-	private static function getUniqueFilename($location, $filename, View $view) {
-		$ext = pathinfo($filename, PATHINFO_EXTENSION);
-		$name = pathinfo($filename, PATHINFO_FILENAME);
-		$l = \OC::$server->getL10N('files_trashbin');
-
-		$location = '/' . trim($location, '/');
-
-		// if extension is not empty we set a dot in front of it
-		if ($ext !== '') {
-			$ext = '.' . $ext;
-		}
-
-		if ($view->file_exists('files' . $location . '/' . $filename)) {
-			$i = 2;
-			$uniqueName = $name . " (" . $l->t("restored") . ")" . $ext;
-			while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
-				$uniqueName = $name . " (" . $l->t("restored") . " " . $i . ")" . $ext;
-				$i++;
-			}
-
-			return $uniqueName;
-		}
-
-		return $filename;
-	}
-
-	/**
-	 * get the size from a given root folder
-	 *
-	 * @param View $view file view on the root folder
-	 * @return integer size of the folder
-	 */
-	private static function calculateSize($view) {
-		$root = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . $view->getAbsolutePath('');
-		if (!file_exists($root)) {
-			return 0;
-		}
-		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
-		$size = 0;
-
-		/**
-		 * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
-		 * This bug is fixed in PHP 5.5.9 or before
-		 * See #8376
-		 */
-		$iterator->rewind();
-		while ($iterator->valid()) {
-			$path = $iterator->current();
-			$relpath = substr($path, strlen($root) - 1);
-			if (!$view->is_dir($relpath)) {
-				$size += $view->filesize($relpath);
-			}
-			$iterator->next();
-		}
-		return $size;
-	}
-
-	/**
-	 * get current size of trash bin from a given user
-	 *
-	 * @param string $user user who owns the trash bin
-	 * @return integer trash bin size
-	 */
-	private static function getTrashbinSize($user) {
-		$view = new View('/' . $user);
-		$fileInfo = $view->getFileInfo('/files_trashbin');
-		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
-	}
-
-	/**
-	 * check if trash bin is empty for a given user
-	 *
-	 * @param string $user
-	 * @return bool
-	 */
-	public static function isEmpty($user) {
-		$view = new View('/' . $user . '/files_trashbin');
-		if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
-			while ($file = readdir($dh)) {
-				if (!Filesystem::isIgnoredDir($file)) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @param $path
-	 * @return string
-	 */
-	public static function preview_icon($path) {
-		return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_trashbin_preview', ['x' => 32, 'y' => 32, 'file' => $path]);
-	}
+    // unit: percentage; 50% of available disk space/quota
+    public const DEFAULTMAXSIZE = 50;
+
+    /**
+     * Whether versions have already be rescanned during this PHP request
+     *
+     * @var bool
+     */
+    private static $scannedVersions = false;
+
+    /**
+     * Ensure we don't need to scan the file during the move to trash
+     * by triggering the scan in the pre-hook
+     *
+     * @param array $params
+     */
+    public static function ensureFileScannedHook($params) {
+        try {
+            self::getUidAndFilename($params['path']);
+        } catch (NotFoundException $e) {
+            // nothing to scan for non existing files
+        }
+    }
+
+    /**
+     * get the UID of the owner of the file and the path to the file relative to
+     * owners files folder
+     *
+     * @param string $filename
+     * @return array
+     * @throws \OC\User\NoUserException
+     */
+    public static function getUidAndFilename($filename) {
+        $uid = Filesystem::getOwner($filename);
+        $userManager = \OC::$server->getUserManager();
+        // if the user with the UID doesn't exists, e.g. because the UID points
+        // to a remote user with a federated cloud ID we use the current logged-in
+        // user. We need a valid local user to move the file to the right trash bin
+        if (!$userManager->userExists($uid)) {
+            $uid = User::getUser();
+        }
+        if (!$uid) {
+            // no owner, usually because of share link from ext storage
+            return [null, null];
+        }
+        Filesystem::initMountPoints($uid);
+        if ($uid !== User::getUser()) {
+            $info = Filesystem::getFileInfo($filename);
+            $ownerView = new View('/' . $uid . '/files');
+            try {
+                $filename = $ownerView->getPath($info['fileid']);
+            } catch (NotFoundException $e) {
+                $filename = null;
+            }
+        }
+        return [$uid, $filename];
+    }
+
+    /**
+     * get original location of files for user
+     *
+     * @param string $user
+     * @return array (filename => array (timestamp => original location))
+     */
+    public static function getLocations($user) {
+        $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $query->select('id', 'timestamp', 'location')
+            ->from('files_trash')
+            ->where($query->expr()->eq('user', $query->createNamedParameter($user)));
+        $result = $query->executeQuery();
+        $array = [];
+        while ($row = $result->fetch()) {
+            if (isset($array[$row['id']])) {
+                $array[$row['id']][$row['timestamp']] = $row['location'];
+            } else {
+                $array[$row['id']] = [$row['timestamp'] => $row['location']];
+            }
+        }
+        $result->closeCursor();
+        return $array;
+    }
+
+    /**
+     * get original location of file
+     *
+     * @param string $user
+     * @param string $filename
+     * @param string $timestamp
+     * @return string original location
+     */
+    public static function getLocation($user, $filename, $timestamp) {
+        $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $query->select('location')
+            ->from('files_trash')
+            ->where($query->expr()->eq('user', $query->createNamedParameter($user)))
+            ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
+            ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
+
+        $result = $query->executeQuery();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if (isset($row['location'])) {
+            return $row['location'];
+        } else {
+            return false;
+        }
+    }
+
+    private static function setUpTrash($user) {
+        $view = new View('/' . $user);
+        if (!$view->is_dir('files_trashbin')) {
+            $view->mkdir('files_trashbin');
+        }
+        if (!$view->is_dir('files_trashbin/files')) {
+            $view->mkdir('files_trashbin/files');
+        }
+        if (!$view->is_dir('files_trashbin/versions')) {
+            $view->mkdir('files_trashbin/versions');
+        }
+        if (!$view->is_dir('files_trashbin/keys')) {
+            $view->mkdir('files_trashbin/keys');
+        }
+    }
+
+
+    /**
+     * copy file to owners trash
+     *
+     * @param string $sourcePath
+     * @param string $owner
+     * @param string $targetPath
+     * @param $user
+     * @param integer $timestamp
+     */
+    private static function copyFilesToUser($sourcePath, $owner, $targetPath, $user, $timestamp) {
+        self::setUpTrash($owner);
+
+        $targetFilename = basename($targetPath);
+        $targetLocation = dirname($targetPath);
+
+        $sourceFilename = basename($sourcePath);
+
+        $view = new View('/');
+
+        $target = $user . '/files_trashbin/files/' . $targetFilename . '.d' . $timestamp;
+        $source = $owner . '/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp;
+        $free = $view->free_space($target);
+        $isUnknownOrUnlimitedFreeSpace = $free < 0;
+        $isEnoughFreeSpaceLeft = $view->filesize($source) < $free;
+        if ($isUnknownOrUnlimitedFreeSpace || $isEnoughFreeSpaceLeft) {
+            self::copy_recursive($source, $target, $view);
+        }
+
+
+        if ($view->file_exists($target)) {
+            $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+            $query->insert('files_trash')
+                ->setValue('id', $query->createNamedParameter($targetFilename))
+                ->setValue('timestamp', $query->createNamedParameter($timestamp))
+                ->setValue('location', $query->createNamedParameter($targetLocation))
+                ->setValue('user', $query->createNamedParameter($user));
+            $result = $query->executeStatement();
+            if (!$result) {
+                \OC::$server->getLogger()->error('trash bin database couldn\'t be updated for the files owner', ['app' => 'files_trashbin']);
+            }
+        }
+    }
+
+
+    /**
+     * move file to the trash bin
+     *
+     * @param string $file_path path to the deleted file/directory relative to the files root directory
+     * @param bool $ownerOnly delete for owner only (if file gets moved out of a shared folder)
+     *
+     * @return bool
+     */
+    public static function move2trash($file_path, $ownerOnly = false) {
+        // get the user for which the filesystem is setup
+        $root = Filesystem::getRoot();
+        [, $user] = explode('/', $root);
+        [$owner, $ownerPath] = self::getUidAndFilename($file_path);
+
+        // if no owner found (ex: ext storage + share link), will use the current user's trashbin then
+        if (is_null($owner)) {
+            $owner = $user;
+            $ownerPath = $file_path;
+        }
+
+        $ownerView = new View('/' . $owner);
+        // file has been deleted in between
+        if (is_null($ownerPath) || $ownerPath === '' || !$ownerView->file_exists('/files/' . $ownerPath)) {
+            return true;
+        }
+
+        self::setUpTrash($user);
+        if ($owner !== $user) {
+            // also setup for owner
+            self::setUpTrash($owner);
+        }
+
+        $path_parts = pathinfo($ownerPath);
+
+        $filename = $path_parts['basename'];
+        $location = $path_parts['dirname'];
+        /** @var ITimeFactory $timeFactory */
+        $timeFactory = \OC::$server->query(ITimeFactory::class);
+        $timestamp = $timeFactory->getTime();
+
+        $lockingProvider = \OC::$server->getLockingProvider();
+
+        // disable proxy to prevent recursive calls
+        $trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp;
+        $gotLock = false;
+
+        while (!$gotLock) {
+            try {
+                /** @var \OC\Files\Storage\Storage $trashStorage */
+                [$trashStorage, $trashInternalPath] = $ownerView->resolvePath($trashPath);
+
+                $trashStorage->acquireLock($trashInternalPath, ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
+                $gotLock = true;
+            } catch (LockedException $e) {
+                // a file with the same name is being deleted concurrently
+                // nudge the timestamp a bit to resolve the conflict
+
+                $timestamp = $timestamp + 1;
+
+                $trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp;
+            }
+        }
+
+        /** @var \OC\Files\Storage\Storage $sourceStorage */
+        [$sourceStorage, $sourceInternalPath] = $ownerView->resolvePath('/files/' . $ownerPath);
+
+
+        if ($trashStorage->file_exists($trashInternalPath)) {
+            $trashStorage->unlink($trashInternalPath);
+        }
+
+        $config = \OC::$server->getConfig();
+        $systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
+        $userTrashbinSize = (int)$config->getUserValue($owner, 'files_trashbin', 'trashbin_size', '-1');
+        $configuredTrashbinSize = ($userTrashbinSize < 0) ? $systemTrashbinSize : $userTrashbinSize;
+        if ($configuredTrashbinSize >= 0 && $sourceStorage->filesize($sourceInternalPath) >= $configuredTrashbinSize) {
+            return false;
+        }
+
+        $trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
+
+        try {
+            $moveSuccessful = true;
+
+            // when moving within the same object store, the cache update done above is enough to move the file
+            if (!($trashStorage->instanceOfStorage(ObjectStoreStorage::class) && $trashStorage->getId() === $sourceStorage->getId())) {
+                $trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
+            }
+        } catch (\OCA\Files_Trashbin\Exceptions\CopyRecursiveException $e) {
+            $moveSuccessful = false;
+            if ($trashStorage->file_exists($trashInternalPath)) {
+                $trashStorage->unlink($trashInternalPath);
+            }
+            \OC::$server->getLogger()->error('Couldn\'t move ' . $file_path . ' to the trash bin', ['app' => 'files_trashbin']);
+        }
+
+        if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort
+            if ($sourceStorage->is_dir($sourceInternalPath)) {
+                $sourceStorage->rmdir($sourceInternalPath);
+            } else {
+                $sourceStorage->unlink($sourceInternalPath);
+            }
+
+            if ($sourceStorage->file_exists($sourceInternalPath)) {
+                // undo the cache move
+                $sourceStorage->getUpdater()->renameFromStorage($trashStorage, $trashInternalPath, $sourceInternalPath);
+            } else {
+                $trashStorage->getUpdater()->remove($trashInternalPath);
+            }
+            return false;
+        }
+
+        if ($moveSuccessful) {
+            $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+            $query->insert('files_trash')
+                ->setValue('id', $query->createNamedParameter($filename))
+                ->setValue('timestamp', $query->createNamedParameter($timestamp))
+                ->setValue('location', $query->createNamedParameter($location))
+                ->setValue('user', $query->createNamedParameter($owner));
+            $result = $query->executeStatement();
+            if (!$result) {
+                \OC::$server->getLogger()->error('trash bin database couldn\'t be updated', ['app' => 'files_trashbin']);
+            }
+            \OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', ['filePath' => Filesystem::normalizePath($file_path),
+                'trashPath' => Filesystem::normalizePath($filename . '.d' . $timestamp)]);
+
+            self::retainVersions($filename, $owner, $ownerPath, $timestamp);
+
+            // if owner !== user we need to also add a copy to the users trash
+            if ($user !== $owner && $ownerOnly === false) {
+                self::copyFilesToUser($ownerPath, $owner, $file_path, $user, $timestamp);
+            }
+        }
+
+        $trashStorage->releaseLock($trashInternalPath, ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
+
+        self::scheduleExpire($user);
+
+        // if owner !== user we also need to update the owners trash size
+        if ($owner !== $user) {
+            self::scheduleExpire($owner);
+        }
+
+        return $moveSuccessful;
+    }
+
+    /**
+     * Move file versions to trash so that they can be restored later
+     *
+     * @param string $filename of deleted file
+     * @param string $owner owner user id
+     * @param string $ownerPath path relative to the owner's home storage
+     * @param integer $timestamp when the file was deleted
+     */
+    private static function retainVersions($filename, $owner, $ownerPath, $timestamp) {
+        if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) {
+            $user = User::getUser();
+            $rootView = new View('/');
+
+            if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
+                if ($owner !== $user) {
+                    self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . basename($ownerPath) . '.d' . $timestamp, $rootView);
+                }
+                self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp);
+            } elseif ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
+                foreach ($versions as $v) {
+                    if ($owner !== $user) {
+                        self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . $v['name'] . '.v' . $v['version'] . '.d' . $timestamp);
+                    }
+                    self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
+                }
+            }
+        }
+    }
+
+    /**
+     * Move a file or folder on storage level
+     *
+     * @param View $view
+     * @param string $source
+     * @param string $target
+     * @return bool
+     */
+    private static function move(View $view, $source, $target) {
+        /** @var \OC\Files\Storage\Storage $sourceStorage */
+        [$sourceStorage, $sourceInternalPath] = $view->resolvePath($source);
+        /** @var \OC\Files\Storage\Storage $targetStorage */
+        [$targetStorage, $targetInternalPath] = $view->resolvePath($target);
+        /** @var \OC\Files\Storage\Storage $ownerTrashStorage */
+
+        $result = $targetStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        if ($result) {
+            $targetStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        }
+        return $result;
+    }
+
+    /**
+     * Copy a file or folder on storage level
+     *
+     * @param View $view
+     * @param string $source
+     * @param string $target
+     * @return bool
+     */
+    private static function copy(View $view, $source, $target) {
+        /** @var \OC\Files\Storage\Storage $sourceStorage */
+        [$sourceStorage, $sourceInternalPath] = $view->resolvePath($source);
+        /** @var \OC\Files\Storage\Storage $targetStorage */
+        [$targetStorage, $targetInternalPath] = $view->resolvePath($target);
+        /** @var \OC\Files\Storage\Storage $ownerTrashStorage */
+
+        $result = $targetStorage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        if ($result) {
+            $targetStorage->getUpdater()->update($targetInternalPath);
+        }
+        return $result;
+    }
+
+    /**
+     * Restore a file or folder from trash bin
+     *
+     * @param string $file path to the deleted file/folder relative to "files_trashbin/files/",
+     * including the timestamp suffix ".d12345678"
+     * @param string $filename name of the file/folder
+     * @param int $timestamp time when the file/folder was deleted
+     *
+     * @return bool true on success, false otherwise
+     */
+    public static function restore($file, $filename, $timestamp) {
+        $user = User::getUser();
+        $view = new View('/' . $user);
+
+        $location = '';
+        if ($timestamp) {
+            $location = self::getLocation($user, $filename, $timestamp);
+            if ($location === false) {
+                \OC::$server->getLogger()->error('trash bin database inconsistent! ($user: ' . $user . ' $filename: ' . $filename . ', $timestamp: ' . $timestamp . ')', ['app' => 'files_trashbin']);
+            } else {
+                // if location no longer exists, restore file in the root directory
+                if ($location !== '/' &&
+                    (!$view->is_dir('files/' . $location) ||
+                        !$view->isCreatable('files/' . $location))
+                ) {
+                    $location = '';
+                }
+            }
+        }
+
+        // we need a  extension in case a file/dir with the same name already exists
+        $uniqueFilename = self::getUniqueFilename($location, $filename, $view);
+
+        $source = Filesystem::normalizePath('files_trashbin/files/' . $file);
+        $target = Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
+        if (!$view->file_exists($source)) {
+            return false;
+        }
+        $mtime = $view->filemtime($source);
+
+        // restore file
+        if (!$view->isCreatable(dirname($target))) {
+            throw new NotPermittedException("Can't restore trash item because the target folder is not writable");
+        }
+        $restoreResult = $view->rename($source, $target);
+
+        // handle the restore result
+        if ($restoreResult) {
+            $fakeRoot = $view->getRoot();
+            $view->chroot('/' . $user . '/files');
+            $view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
+            $view->chroot($fakeRoot);
+            \OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', ['filePath' => Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename),
+                'trashPath' => Filesystem::normalizePath($file)]);
+
+            self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
+
+            if ($timestamp) {
+                $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+                $query->delete('files_trash')
+                    ->where($query->expr()->eq('user', $query->createNamedParameter($user)))
+                    ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
+                    ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
+                $query->executeStatement();
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * restore versions from trash bin
+     *
+     * @param View $view file view
+     * @param string $file complete path to file
+     * @param string $filename name of file once it was deleted
+     * @param string $uniqueFilename new file name to restore the file without overwriting existing files
+     * @param string $location location if file
+     * @param int $timestamp deletion time
+     * @return false|null
+     */
+    private static function restoreVersions(View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
+        if (\OCP\App::isEnabled('files_versions')) {
+            $user = User::getUser();
+            $rootView = new View('/');
+
+            $target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
+
+            [$owner, $ownerPath] = self::getUidAndFilename($target);
+
+            // file has been deleted in between
+            if (empty($ownerPath)) {
+                return false;
+            }
+
+            if ($timestamp) {
+                $versionedFile = $filename;
+            } else {
+                $versionedFile = $file;
+            }
+
+            if ($view->is_dir('/files_trashbin/versions/' . $file)) {
+                $rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
+            } elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
+                foreach ($versions as $v) {
+                    if ($timestamp) {
+                        $rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+                    } else {
+                        $rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * delete all files from the trash
+     */
+    public static function deleteAll() {
+        $user = User::getUser();
+        $userRoot = \OC::$server->getUserFolder($user)->getParent();
+        $view = new View('/' . $user);
+        $fileInfos = $view->getDirectoryContent('files_trashbin/files');
+
+        try {
+            $trash = $userRoot->get('files_trashbin');
+        } catch (NotFoundException $e) {
+            return false;
+        }
+
+        // Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
+        $filePaths = [];
+        foreach ($fileInfos as $fileInfo) {
+            $filePaths[] = $view->getRelativePath($fileInfo->getPath());
+        }
+        unset($fileInfos); // save memory
+
+        // Bulk PreDelete-Hook
+        \OC_Hook::emit('\OCP\Trashbin', 'preDeleteAll', ['paths' => $filePaths]);
+
+        // Single-File Hooks
+        foreach ($filePaths as $path) {
+            self::emitTrashbinPreDelete($path);
+        }
+
+        // actual file deletion
+        $trash->delete();
+
+        $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $query->delete('files_trash')
+            ->where($query->expr()->eq('user', $query->createNamedParameter($user)));
+        $query->executeStatement();
+
+        // Bulk PostDelete-Hook
+        \OC_Hook::emit('\OCP\Trashbin', 'deleteAll', ['paths' => $filePaths]);
+
+        // Single-File Hooks
+        foreach ($filePaths as $path) {
+            self::emitTrashbinPostDelete($path);
+        }
+
+        $trash = $userRoot->newFolder('files_trashbin');
+        $trash->newFolder('files');
+
+        return true;
+    }
+
+    /**
+     * wrapper function to emit the 'preDelete' hook of \OCP\Trashbin before a file is deleted
+     *
+     * @param string $path
+     */
+    protected static function emitTrashbinPreDelete($path) {
+        \OC_Hook::emit('\OCP\Trashbin', 'preDelete', ['path' => $path]);
+    }
+
+    /**
+     * wrapper function to emit the 'delete' hook of \OCP\Trashbin after a file has been deleted
+     *
+     * @param string $path
+     */
+    protected static function emitTrashbinPostDelete($path) {
+        \OC_Hook::emit('\OCP\Trashbin', 'delete', ['path' => $path]);
+    }
+
+    /**
+     * delete file from trash bin permanently
+     *
+     * @param string $filename path to the file
+     * @param string $user
+     * @param int $timestamp of deletion time
+     *
+     * @return int size of deleted files
+     */
+    public static function delete($filename, $user, $timestamp = null) {
+        $userRoot = \OC::$server->getUserFolder($user)->getParent();
+        $view = new View('/' . $user);
+        $size = 0;
+
+        if ($timestamp) {
+            $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+            $query->delete('files_trash')
+                ->where($query->expr()->eq('user', $query->createNamedParameter($user)))
+                ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
+                ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
+            $query->executeStatement();
+
+            $file = $filename . '.d' . $timestamp;
+        } else {
+            $file = $filename;
+        }
+
+        $size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
+
+        try {
+            $node = $userRoot->get('/files_trashbin/files/' . $file);
+        } catch (NotFoundException $e) {
+            return $size;
+        }
+
+        if ($node instanceof Folder) {
+            $size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file));
+        } elseif ($node instanceof File) {
+            $size += $view->filesize('/files_trashbin/files/' . $file);
+        }
+
+        self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
+        $node->delete();
+        self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
+
+        return $size;
+    }
+
+    /**
+     * @param View $view
+     * @param string $file
+     * @param string $filename
+     * @param integer|null $timestamp
+     * @param string $user
+     * @return int
+     */
+    private static function deleteVersions(View $view, $file, $filename, $timestamp, $user) {
+        $size = 0;
+        if (\OCP\App::isEnabled('files_versions')) {
+            if ($view->is_dir('files_trashbin/versions/' . $file)) {
+                $size += self::calculateSize(new View('/' . $user . '/files_trashbin/versions/' . $file));
+                $view->unlink('files_trashbin/versions/' . $file);
+            } elseif ($versions = self::getVersionsFromTrash($filename, $timestamp, $user)) {
+                foreach ($versions as $v) {
+                    if ($timestamp) {
+                        $size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
+                        $view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
+                    } else {
+                        $size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
+                        $view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
+                    }
+                }
+            }
+        }
+        return $size;
+    }
+
+    /**
+     * check to see whether a file exists in trashbin
+     *
+     * @param string $filename path to the file
+     * @param int $timestamp of deletion time
+     * @return bool true if file exists, otherwise false
+     */
+    public static function file_exists($filename, $timestamp = null) {
+        $user = User::getUser();
+        $view = new View('/' . $user);
+
+        if ($timestamp) {
+            $filename = $filename . '.d' . $timestamp;
+        }
+
+        $target = Filesystem::normalizePath('files_trashbin/files/' . $filename);
+        return $view->file_exists($target);
+    }
+
+    /**
+     * deletes used space for trash bin in db if user was deleted
+     *
+     * @param string $uid id of deleted user
+     * @return bool result of db delete operation
+     */
+    public static function deleteUser($uid) {
+        $query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $query->delete('files_trash')
+            ->where($query->expr()->eq('user', $query->createNamedParameter($uid)));
+        return (bool) $query->executeStatement();
+    }
+
+    /**
+     * calculate remaining free space for trash bin
+     *
+     * @param integer $trashbinSize current size of the trash bin
+     * @param string $user
+     * @return int available free space for trash bin
+     */
+    private static function calculateFreeSpace($trashbinSize, $user) {
+        $config = \OC::$server->getConfig();
+        $userTrashbinSize = (int)$config->getUserValue($user, 'files_trashbin', 'trashbin_size', '-1');
+        if ($userTrashbinSize > -1) {
+            return $userTrashbinSize - $trashbinSize;
+        }
+        $systemTrashbinSize = (int)$config->getAppValue('files_trashbin', 'trashbin_size', '-1');
+        if ($systemTrashbinSize > -1) {
+            return $systemTrashbinSize - $trashbinSize;
+        }
+
+        $softQuota = true;
+        $userObject = \OC::$server->getUserManager()->get($user);
+        if (is_null($userObject)) {
+            return 0;
+        }
+        $quota = $userObject->getQuota();
+        if ($quota === null || $quota === 'none') {
+            $quota = Filesystem::free_space('/');
+            $softQuota = false;
+            // inf or unknown free space
+            if ($quota < 0) {
+                $quota = PHP_INT_MAX;
+            }
+        } else {
+            $quota = \OCP\Util::computerFileSize($quota);
+        }
+
+        // calculate available space for trash bin
+        // subtract size of files and current trash bin size from quota
+        if ($softQuota) {
+            $userFolder = \OC::$server->getUserFolder($user);
+            if (is_null($userFolder)) {
+                return 0;
+            }
+            $free = $quota - $userFolder->getSize(false); // remaining free space for user
+            if ($free > 0) {
+                $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
+            } else {
+                $availableSpace = $free - $trashbinSize;
+            }
+        } else {
+            $availableSpace = $quota;
+        }
+
+        return $availableSpace;
+    }
+
+    /**
+     * resize trash bin if necessary after a new file was added to Nextcloud
+     *
+     * @param string $user user id
+     */
+    public static function resizeTrash($user) {
+        $size = self::getTrashbinSize($user);
+
+        $freeSpace = self::calculateFreeSpace($size, $user);
+
+        if ($freeSpace < 0) {
+            self::scheduleExpire($user);
+        }
+    }
+
+    /**
+     * clean up the trash bin
+     *
+     * @param string $user
+     */
+    public static function expire($user) {
+        $trashBinSize = self::getTrashbinSize($user);
+        $availableSpace = self::calculateFreeSpace($trashBinSize, $user);
+
+        $dirContent = Helper::getTrashFiles('/', $user, 'mtime');
+
+        // delete all files older then $retention_obligation
+        [$delSize, $count] = self::deleteExpiredFiles($dirContent, $user);
+
+        $availableSpace += $delSize;
+
+        // delete files from trash until we meet the trash bin size limit again
+        self::deleteFiles(array_slice($dirContent, $count), $user, $availableSpace);
+    }
+
+    /**
+     * @param string $user
+     */
+    private static function scheduleExpire($user) {
+        // let the admin disable auto expire
+        /** @var Application $application */
+        $application = \OC::$server->query(Application::class);
+        $expiration = $application->getContainer()->query('Expiration');
+        if ($expiration->isEnabled()) {
+            \OC::$server->getCommandBus()->push(new Expire($user));
+        }
+    }
+
+    /**
+     * if the size limit for the trash bin is reached, we delete the oldest
+     * files in the trash bin until we meet the limit again
+     *
+     * @param array $files
+     * @param string $user
+     * @param int $availableSpace available disc space
+     * @return int size of deleted files
+     */
+    protected static function deleteFiles($files, $user, $availableSpace) {
+        /** @var Application $application */
+        $application = \OC::$server->query(Application::class);
+        $expiration = $application->getContainer()->query('Expiration');
+        $size = 0;
+
+        if ($availableSpace < 0) {
+            foreach ($files as $file) {
+                if ($availableSpace < 0 && $expiration->isExpired($file['mtime'], true)) {
+                    $tmp = self::delete($file['name'], $user, $file['mtime']);
+                    \OC::$server->getLogger()->info('remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota)', ['app' => 'files_trashbin']);
+                    $availableSpace += $tmp;
+                    $size += $tmp;
+                } else {
+                    break;
+                }
+            }
+        }
+        return $size;
+    }
+
+    /**
+     * delete files older then max storage time
+     *
+     * @param array $files list of files sorted by mtime
+     * @param string $user
+     * @return integer[] size of deleted files and number of deleted files
+     */
+    public static function deleteExpiredFiles($files, $user) {
+        /** @var Expiration $expiration */
+        $expiration = \OC::$server->query(Expiration::class);
+        $size = 0;
+        $count = 0;
+        foreach ($files as $file) {
+            $timestamp = $file['mtime'];
+            $filename = $file['name'];
+            if ($expiration->isExpired($timestamp)) {
+                try {
+                    $size += self::delete($filename, $user, $timestamp);
+                    $count++;
+                } catch (\OCP\Files\NotPermittedException $e) {
+                    \OC::$server->getLogger()->logException($e, ['app' => 'files_trashbin', 'level' => \OCP\ILogger::WARN, 'message' => 'Removing "' . $filename . '" from trashbin failed.']);
+                }
+                \OC::$server->getLogger()->info(
+                    'Remove "' . $filename . '" from trashbin because it exceeds max retention obligation term.',
+                    ['app' => 'files_trashbin']
+                );
+            } else {
+                break;
+            }
+        }
+
+        return [$size, $count];
+    }
+
+    /**
+     * recursive copy to copy a whole directory
+     *
+     * @param string $source source path, relative to the users files directory
+     * @param string $destination destination path relative to the users root directoy
+     * @param View $view file view for the users root directory
+     * @return int
+     * @throws Exceptions\CopyRecursiveException
+     */
+    private static function copy_recursive($source, $destination, View $view) {
+        $size = 0;
+        if ($view->is_dir($source)) {
+            $view->mkdir($destination);
+            $view->touch($destination, $view->filemtime($source));
+            foreach ($view->getDirectoryContent($source) as $i) {
+                $pathDir = $source . '/' . $i['name'];
+                if ($view->is_dir($pathDir)) {
+                    $size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
+                } else {
+                    $size += $view->filesize($pathDir);
+                    $result = $view->copy($pathDir, $destination . '/' . $i['name']);
+                    if (!$result) {
+                        throw new \OCA\Files_Trashbin\Exceptions\CopyRecursiveException();
+                    }
+                    $view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir));
+                }
+            }
+        } else {
+            $size += $view->filesize($source);
+            $result = $view->copy($source, $destination);
+            if (!$result) {
+                throw new \OCA\Files_Trashbin\Exceptions\CopyRecursiveException();
+            }
+            $view->touch($destination, $view->filemtime($source));
+        }
+        return $size;
+    }
+
+    /**
+     * find all versions which belong to the file we want to restore
+     *
+     * @param string $filename name of the file which should be restored
+     * @param int $timestamp timestamp when the file was deleted
+     * @return array
+     */
+    private static function getVersionsFromTrash($filename, $timestamp, $user) {
+        $view = new View('/' . $user . '/files_trashbin/versions');
+        $versions = [];
+
+        /** @var \OC\Files\Storage\Storage $storage */
+        [$storage,] = $view->resolvePath('/');
+
+        //force rescan of versions, local storage may not have updated the cache
+        if (!self::$scannedVersions) {
+            $storage->getScanner()->scan('files_trashbin/versions');
+            self::$scannedVersions = true;
+        }
+
+        $pattern = \OC::$server->getDatabaseConnection()->escapeLikeParameter(basename($filename));
+        if ($timestamp) {
+            // fetch for old versions
+            $escapedTimestamp = \OC::$server->getDatabaseConnection()->escapeLikeParameter($timestamp);
+            $pattern .= '.v%.d' . $escapedTimestamp;
+            $offset = -strlen($escapedTimestamp) - 2;
+        } else {
+            $pattern .= '.v%';
+        }
+
+        // Manually fetch all versions from the file cache to be able to filter them by their parent
+        $cache = $storage->getCache('');
+        $query = new CacheQueryBuilder(
+            \OC::$server->getDatabaseConnection(),
+            \OC::$server->getSystemConfig(),
+            \OC::$server->getLogger(),
+            $cache
+        );
+        $normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/'. $filename)), '/');
+        $parentId = $cache->getId($normalizedParentPath);
+        if ($parentId === -1) {
+            return [];
+        }
+
+        $query->selectFileCache()
+            ->whereStorageId()
+            ->andWhere($query->expr()->eq('parent', $query->createNamedParameter($parentId)))
+            ->andWhere($query->expr()->iLike('name', $query->createNamedParameter($pattern)));
+
+        $result = $query->executeQuery();
+        $entries = $result->fetchAll();
+        $result->closeCursor();
+
+        /** @var CacheEntry[] $matches */
+        $matches = array_map(function (array $data) {
+            return Cache::cacheEntryFromData($data, \OC::$server->getMimeTypeLoader());
+        }, $entries);
+
+        foreach ($matches as $ma) {
+            if ($timestamp) {
+                $parts = explode('.v', substr($ma['path'], 0, $offset));
+                $versions[] = end($parts);
+            } else {
+                $parts = explode('.v', $ma['path']);
+                $versions[] = end($parts);
+            }
+        }
+
+        return $versions;
+    }
+
+    /**
+     * find unique extension for restored file if a file with the same name already exists
+     *
+     * @param string $location where the file should be restored
+     * @param string $filename name of the file
+     * @param View $view filesystem view relative to users root directory
+     * @return string with unique extension
+     */
+    private static function getUniqueFilename($location, $filename, View $view) {
+        $ext = pathinfo($filename, PATHINFO_EXTENSION);
+        $name = pathinfo($filename, PATHINFO_FILENAME);
+        $l = \OC::$server->getL10N('files_trashbin');
+
+        $location = '/' . trim($location, '/');
+
+        // if extension is not empty we set a dot in front of it
+        if ($ext !== '') {
+            $ext = '.' . $ext;
+        }
+
+        if ($view->file_exists('files' . $location . '/' . $filename)) {
+            $i = 2;
+            $uniqueName = $name . " (" . $l->t("restored") . ")" . $ext;
+            while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
+                $uniqueName = $name . " (" . $l->t("restored") . " " . $i . ")" . $ext;
+                $i++;
+            }
+
+            return $uniqueName;
+        }
+
+        return $filename;
+    }
+
+    /**
+     * get the size from a given root folder
+     *
+     * @param View $view file view on the root folder
+     * @return integer size of the folder
+     */
+    private static function calculateSize($view) {
+        $root = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . $view->getAbsolutePath('');
+        if (!file_exists($root)) {
+            return 0;
+        }
+        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
+        $size = 0;
+
+        /**
+         * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
+         * This bug is fixed in PHP 5.5.9 or before
+         * See #8376
+         */
+        $iterator->rewind();
+        while ($iterator->valid()) {
+            $path = $iterator->current();
+            $relpath = substr($path, strlen($root) - 1);
+            if (!$view->is_dir($relpath)) {
+                $size += $view->filesize($relpath);
+            }
+            $iterator->next();
+        }
+        return $size;
+    }
+
+    /**
+     * get current size of trash bin from a given user
+     *
+     * @param string $user user who owns the trash bin
+     * @return integer trash bin size
+     */
+    private static function getTrashbinSize($user) {
+        $view = new View('/' . $user);
+        $fileInfo = $view->getFileInfo('/files_trashbin');
+        return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
+    }
+
+    /**
+     * check if trash bin is empty for a given user
+     *
+     * @param string $user
+     * @return bool
+     */
+    public static function isEmpty($user) {
+        $view = new View('/' . $user . '/files_trashbin');
+        if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
+            while ($file = readdir($dh)) {
+                if (!Filesystem::isIgnoredDir($file)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @param $path
+     * @return string
+     */
+    public static function preview_icon($path) {
+        return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_trashbin_preview', ['x' => 32, 'y' => 32, 'file' => $path]);
+    }
 }

apps/federatedfilesharing/lib/Controller/RequestHandlerController.php

Indentation +400 added lines, -400 removed lines

@@ -50,404 +50,404 @@
 
 class RequestHandlerController extends OCSController {
 
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	/** @var IDBConnection */
-	private $connection;
-
-	/** @var Share\IManager */
-	private $shareManager;
-
-	/** @var Notifications */
-	private $notifications;
-
-	/** @var AddressHandler */
-	private $addressHandler;
-
-	/** @var  IUserManager */
-	private $userManager;
-
-	/** @var string */
-	private $shareTable = 'share';
-
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var ICloudFederationFactory */
-	private $cloudFederationFactory;
-
-	/** @var ICloudFederationProviderManager */
-	private $cloudFederationProviderManager;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								FederatedShareProvider $federatedShareProvider,
-								IDBConnection $connection,
-								Share\IManager $shareManager,
-								Notifications $notifications,
-								AddressHandler $addressHandler,
-								IUserManager $userManager,
-								ICloudIdManager $cloudIdManager,
-								LoggerInterface $logger,
-								ICloudFederationFactory $cloudFederationFactory,
-								ICloudFederationProviderManager $cloudFederationProviderManager
-	) {
-		parent::__construct($appName, $request);
-
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->connection = $connection;
-		$this->shareManager = $shareManager;
-		$this->notifications = $notifications;
-		$this->addressHandler = $addressHandler;
-		$this->userManager = $userManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->logger = $logger;
-		$this->cloudFederationFactory = $cloudFederationFactory;
-		$this->cloudFederationProviderManager = $cloudFederationProviderManager;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * create a new share
-	 *
-	 * @return Http\DataResponse
-	 * @throws OCSException
-	 */
-	public function createShare() {
-		$remote = isset($_POST['remote']) ? $_POST['remote'] : null;
-		$token = isset($_POST['token']) ? $_POST['token'] : null;
-		$name = isset($_POST['name']) ? $_POST['name'] : null;
-		$owner = isset($_POST['owner']) ? $_POST['owner'] : null;
-		$sharedBy = isset($_POST['sharedBy']) ? $_POST['sharedBy'] : null;
-		$shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : null;
-		$remoteId = isset($_POST['remoteId']) ? (int)$_POST['remoteId'] : null;
-		$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
-		$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
-
-		if ($ownerFederatedId === null) {
-			$ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
-		}
-		// if the owner of the share and the initiator are the same user
-		// we also complete the federated share ID for the initiator
-		if ($sharedByFederatedId === null && $owner === $sharedBy) {
-			$sharedByFederatedId = $ownerFederatedId;
-		}
-
-		$share = $this->cloudFederationFactory->getCloudFederationShare(
-			$shareWith,
-			$name,
-			'',
-			$remoteId,
-			$ownerFederatedId,
-			$owner,
-			$sharedByFederatedId,
-			$sharedBy,
-			$token,
-			'user',
-			'file'
-		);
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$provider->shareReceived($share);
-		} catch (ProviderDoesNotExistsException $e) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		} catch (ProviderCouldNotAddShareException $e) {
-			throw new OCSException($e->getMessage(), 400);
-		} catch (\Exception $e) {
-			throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
-		}
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * create re-share on behalf of another user
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSBadRequestException
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function reShare($id) {
-		$token = $this->request->getParam('token', null);
-		$shareWith = $this->request->getParam('shareWith', null);
-		$permission = (int)$this->request->getParam('permission', null);
-		$remoteId = (int)$this->request->getParam('remoteId', null);
-
-		if ($id === null ||
-			$token === null ||
-			$shareWith === null ||
-			$permission === null ||
-			$remoteId === null
-		) {
-			throw new OCSBadRequestException();
-		}
-
-		$notification = [
-			'sharedSecret' => $token,
-			'shareWith' => $shareWith,
-			'senderId' => $remoteId,
-			'message' => 'Recipient of a share ask the owner to reshare the file'
-		];
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			[$newToken, $localId] = $provider->notificationReceived('REQUEST_RESHARE', $id, $notification);
-			return new Http\DataResponse([
-				'token' => $newToken,
-				'remoteId' => $localId
-			]);
-		} catch (ProviderDoesNotExistsException $e) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		} catch (ShareNotFound $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage(), ['exception' => $e]);
-		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage(), ['exception' => $e]);
-		}
-
-		throw new OCSBadRequestException();
-	}
-
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * accept server-to-server share
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSException
-	 * @throws ShareNotFound
-	 * @throws \OC\HintException
-	 */
-	public function acceptShare($id) {
-		$token = isset($_POST['token']) ? $_POST['token'] : null;
-
-		$notification = [
-			'sharedSecret' => $token,
-			'message' => 'Recipient accept the share'
-		];
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$provider->notificationReceived('SHARE_ACCEPTED', $id, $notification);
-		} catch (ProviderDoesNotExistsException $e) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		} catch (ShareNotFound $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage(), ['exception' => $e]);
-		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage(), ['exception' => $e]);
-		}
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * decline server-to-server share
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSException
-	 */
-	public function declineShare($id) {
-		$token = isset($_POST['token']) ? $_POST['token'] : null;
-
-		$notification = [
-			'sharedSecret' => $token,
-			'message' => 'Recipient declined the share'
-		];
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$provider->notificationReceived('SHARE_DECLINED', $id, $notification);
-		} catch (ProviderDoesNotExistsException $e) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		} catch (ShareNotFound $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage(), ['exception' => $e]);
-		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage(), ['exception' => $e]);
-		}
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * remove server-to-server share if it was unshared by the owner
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSException
-	 */
-	public function unshare($id) {
-		if (!$this->isS2SEnabled()) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		}
-
-		$token = isset($_POST['token']) ? $_POST['token'] : null;
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$notification = ['sharedSecret' => $token];
-			$provider->notificationReceived('SHARE_UNSHARED', $id, $notification);
-		} catch (\Exception $e) {
-			$this->logger->debug('processing unshare notification failed: ' . $e->getMessage(), ['exception' => $e]);
-		}
-
-		return new Http\DataResponse();
-	}
-
-	private function cleanupRemote($remote) {
-		$remote = substr($remote, strpos($remote, '://') + 3);
-
-		return rtrim($remote, '/');
-	}
-
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * federated share was revoked, either by the owner or the re-sharer
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function revoke($id) {
-		$token = $this->request->getParam('token');
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$notification = ['sharedSecret' => $token];
-			$provider->notificationReceived('RESHARE_UNDO', $id, $notification);
-			return new Http\DataResponse();
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException();
-		}
-	}
-
-	/**
-	 * check if server-to-server sharing is enabled
-	 *
-	 * @param bool $incoming
-	 * @return bool
-	 */
-	private function isS2SEnabled($incoming = false) {
-		$result = \OCP\App::isEnabled('files_sharing');
-
-		if ($incoming) {
-			$result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled();
-		} else {
-			$result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * update share information to keep federated re-shares in sync
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function updatePermissions($id) {
-		$token = $this->request->getParam('token', null);
-		$ncPermissions = $this->request->getParam('permissions', null);
-
-		try {
-			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$ocmPermissions = $this->ncPermissions2ocmPermissions((int)$ncPermissions);
-			$notification = ['sharedSecret' => $token, 'permission' => $ocmPermissions];
-			$provider->notificationReceived('RESHARE_CHANGE_PERMISSION', $id, $notification);
-		} catch (\Exception $e) {
-			$this->logger->debug($e->getMessage(), ['exception' => $e]);
-			throw new OCSBadRequestException();
-		}
-
-		return new Http\DataResponse();
-	}
-
-	/**
-	 * translate Nextcloud permissions to OCM Permissions
-	 *
-	 * @param $ncPermissions
-	 * @return array
-	 */
-	protected function ncPermissions2ocmPermissions($ncPermissions) {
-		$ocmPermissions = [];
-
-		if ($ncPermissions & Constants::PERMISSION_SHARE) {
-			$ocmPermissions[] = 'share';
-		}
-
-		if ($ncPermissions & Constants::PERMISSION_READ) {
-			$ocmPermissions[] = 'read';
-		}
-
-		if (($ncPermissions & Constants::PERMISSION_CREATE) ||
-			($ncPermissions & Constants::PERMISSION_UPDATE)) {
-			$ocmPermissions[] = 'write';
-		}
-
-		return $ocmPermissions;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 *
-	 * change the owner of a server-to-server share
-	 *
-	 * @param int $id
-	 * @return Http\DataResponse
-	 * @throws \InvalidArgumentException
-	 * @throws OCSException
-	 */
-	public function move($id) {
-		if (!$this->isS2SEnabled()) {
-			throw new OCSException('Server does not support federated cloud sharing', 503);
-		}
-
-		$token = $this->request->getParam('token');
-		$remote = $this->request->getParam('remote');
-		$newRemoteId = $this->request->getParam('remote_id', $id);
-		$cloudId = $this->cloudIdManager->resolveCloudId($remote);
-
-		$qb = $this->connection->getQueryBuilder();
-		$query = $qb->update('share_external')
-			->set('remote', $qb->createNamedParameter($cloudId->getRemote()))
-			->set('owner', $qb->createNamedParameter($cloudId->getUser()))
-			->set('remote_id', $qb->createNamedParameter($newRemoteId))
-			->where($qb->expr()->eq('remote_id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('share_token', $qb->createNamedParameter($token)));
-		$affected = $query->executeStatement();
-
-		if ($affected > 0) {
-			return new Http\DataResponse(['remote' => $cloudId->getRemote(), 'owner' => $cloudId->getUser()]);
-		} else {
-			throw new OCSBadRequestException('Share not found or token invalid');
-		}
-	}
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+
+    /** @var IDBConnection */
+    private $connection;
+
+    /** @var Share\IManager */
+    private $shareManager;
+
+    /** @var Notifications */
+    private $notifications;
+
+    /** @var AddressHandler */
+    private $addressHandler;
+
+    /** @var  IUserManager */
+    private $userManager;
+
+    /** @var string */
+    private $shareTable = 'share';
+
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    /** @var ICloudFederationFactory */
+    private $cloudFederationFactory;
+
+    /** @var ICloudFederationProviderManager */
+    private $cloudFederationProviderManager;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                FederatedShareProvider $federatedShareProvider,
+                                IDBConnection $connection,
+                                Share\IManager $shareManager,
+                                Notifications $notifications,
+                                AddressHandler $addressHandler,
+                                IUserManager $userManager,
+                                ICloudIdManager $cloudIdManager,
+                                LoggerInterface $logger,
+                                ICloudFederationFactory $cloudFederationFactory,
+                                ICloudFederationProviderManager $cloudFederationProviderManager
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->connection = $connection;
+        $this->shareManager = $shareManager;
+        $this->notifications = $notifications;
+        $this->addressHandler = $addressHandler;
+        $this->userManager = $userManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->logger = $logger;
+        $this->cloudFederationFactory = $cloudFederationFactory;
+        $this->cloudFederationProviderManager = $cloudFederationProviderManager;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * create a new share
+     *
+     * @return Http\DataResponse
+     * @throws OCSException
+     */
+    public function createShare() {
+        $remote = isset($_POST['remote']) ? $_POST['remote'] : null;
+        $token = isset($_POST['token']) ? $_POST['token'] : null;
+        $name = isset($_POST['name']) ? $_POST['name'] : null;
+        $owner = isset($_POST['owner']) ? $_POST['owner'] : null;
+        $sharedBy = isset($_POST['sharedBy']) ? $_POST['sharedBy'] : null;
+        $shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : null;
+        $remoteId = isset($_POST['remoteId']) ? (int)$_POST['remoteId'] : null;
+        $sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
+        $ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
+
+        if ($ownerFederatedId === null) {
+            $ownerFederatedId = $this->cloudIdManager->getCloudId($owner, $this->cleanupRemote($remote))->getId();
+        }
+        // if the owner of the share and the initiator are the same user
+        // we also complete the federated share ID for the initiator
+        if ($sharedByFederatedId === null && $owner === $sharedBy) {
+            $sharedByFederatedId = $ownerFederatedId;
+        }
+
+        $share = $this->cloudFederationFactory->getCloudFederationShare(
+            $shareWith,
+            $name,
+            '',
+            $remoteId,
+            $ownerFederatedId,
+            $owner,
+            $sharedByFederatedId,
+            $sharedBy,
+            $token,
+            'user',
+            'file'
+        );
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $provider->shareReceived($share);
+        } catch (ProviderDoesNotExistsException $e) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        } catch (ProviderCouldNotAddShareException $e) {
+            throw new OCSException($e->getMessage(), 400);
+        } catch (\Exception $e) {
+            throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
+        }
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * create re-share on behalf of another user
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSBadRequestException
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function reShare($id) {
+        $token = $this->request->getParam('token', null);
+        $shareWith = $this->request->getParam('shareWith', null);
+        $permission = (int)$this->request->getParam('permission', null);
+        $remoteId = (int)$this->request->getParam('remoteId', null);
+
+        if ($id === null ||
+            $token === null ||
+            $shareWith === null ||
+            $permission === null ||
+            $remoteId === null
+        ) {
+            throw new OCSBadRequestException();
+        }
+
+        $notification = [
+            'sharedSecret' => $token,
+            'shareWith' => $shareWith,
+            'senderId' => $remoteId,
+            'message' => 'Recipient of a share ask the owner to reshare the file'
+        ];
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            [$newToken, $localId] = $provider->notificationReceived('REQUEST_RESHARE', $id, $notification);
+            return new Http\DataResponse([
+                'token' => $newToken,
+                'remoteId' => $localId
+            ]);
+        } catch (ProviderDoesNotExistsException $e) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        } catch (ShareNotFound $e) {
+            $this->logger->debug('Share not found: ' . $e->getMessage(), ['exception' => $e]);
+        } catch (\Exception $e) {
+            $this->logger->debug('internal server error, can not process notification: ' . $e->getMessage(), ['exception' => $e]);
+        }
+
+        throw new OCSBadRequestException();
+    }
+
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * accept server-to-server share
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSException
+     * @throws ShareNotFound
+     * @throws \OC\HintException
+     */
+    public function acceptShare($id) {
+        $token = isset($_POST['token']) ? $_POST['token'] : null;
+
+        $notification = [
+            'sharedSecret' => $token,
+            'message' => 'Recipient accept the share'
+        ];
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $provider->notificationReceived('SHARE_ACCEPTED', $id, $notification);
+        } catch (ProviderDoesNotExistsException $e) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        } catch (ShareNotFound $e) {
+            $this->logger->debug('Share not found: ' . $e->getMessage(), ['exception' => $e]);
+        } catch (\Exception $e) {
+            $this->logger->debug('internal server error, can not process notification: ' . $e->getMessage(), ['exception' => $e]);
+        }
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * decline server-to-server share
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSException
+     */
+    public function declineShare($id) {
+        $token = isset($_POST['token']) ? $_POST['token'] : null;
+
+        $notification = [
+            'sharedSecret' => $token,
+            'message' => 'Recipient declined the share'
+        ];
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $provider->notificationReceived('SHARE_DECLINED', $id, $notification);
+        } catch (ProviderDoesNotExistsException $e) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        } catch (ShareNotFound $e) {
+            $this->logger->debug('Share not found: ' . $e->getMessage(), ['exception' => $e]);
+        } catch (\Exception $e) {
+            $this->logger->debug('internal server error, can not process notification: ' . $e->getMessage(), ['exception' => $e]);
+        }
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * remove server-to-server share if it was unshared by the owner
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSException
+     */
+    public function unshare($id) {
+        if (!$this->isS2SEnabled()) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        }
+
+        $token = isset($_POST['token']) ? $_POST['token'] : null;
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $notification = ['sharedSecret' => $token];
+            $provider->notificationReceived('SHARE_UNSHARED', $id, $notification);
+        } catch (\Exception $e) {
+            $this->logger->debug('processing unshare notification failed: ' . $e->getMessage(), ['exception' => $e]);
+        }
+
+        return new Http\DataResponse();
+    }
+
+    private function cleanupRemote($remote) {
+        $remote = substr($remote, strpos($remote, '://') + 3);
+
+        return rtrim($remote, '/');
+    }
+
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * federated share was revoked, either by the owner or the re-sharer
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function revoke($id) {
+        $token = $this->request->getParam('token');
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $notification = ['sharedSecret' => $token];
+            $provider->notificationReceived('RESHARE_UNDO', $id, $notification);
+            return new Http\DataResponse();
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException();
+        }
+    }
+
+    /**
+     * check if server-to-server sharing is enabled
+     *
+     * @param bool $incoming
+     * @return bool
+     */
+    private function isS2SEnabled($incoming = false) {
+        $result = \OCP\App::isEnabled('files_sharing');
+
+        if ($incoming) {
+            $result = $result && $this->federatedShareProvider->isIncomingServer2serverShareEnabled();
+        } else {
+            $result = $result && $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        }
+
+        return $result;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * update share information to keep federated re-shares in sync
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function updatePermissions($id) {
+        $token = $this->request->getParam('token', null);
+        $ncPermissions = $this->request->getParam('permissions', null);
+
+        try {
+            $provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
+            $ocmPermissions = $this->ncPermissions2ocmPermissions((int)$ncPermissions);
+            $notification = ['sharedSecret' => $token, 'permission' => $ocmPermissions];
+            $provider->notificationReceived('RESHARE_CHANGE_PERMISSION', $id, $notification);
+        } catch (\Exception $e) {
+            $this->logger->debug($e->getMessage(), ['exception' => $e]);
+            throw new OCSBadRequestException();
+        }
+
+        return new Http\DataResponse();
+    }
+
+    /**
+     * translate Nextcloud permissions to OCM Permissions
+     *
+     * @param $ncPermissions
+     * @return array
+     */
+    protected function ncPermissions2ocmPermissions($ncPermissions) {
+        $ocmPermissions = [];
+
+        if ($ncPermissions & Constants::PERMISSION_SHARE) {
+            $ocmPermissions[] = 'share';
+        }
+
+        if ($ncPermissions & Constants::PERMISSION_READ) {
+            $ocmPermissions[] = 'read';
+        }
+
+        if (($ncPermissions & Constants::PERMISSION_CREATE) ||
+            ($ncPermissions & Constants::PERMISSION_UPDATE)) {
+            $ocmPermissions[] = 'write';
+        }
+
+        return $ocmPermissions;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * change the owner of a server-to-server share
+     *
+     * @param int $id
+     * @return Http\DataResponse
+     * @throws \InvalidArgumentException
+     * @throws OCSException
+     */
+    public function move($id) {
+        if (!$this->isS2SEnabled()) {
+            throw new OCSException('Server does not support federated cloud sharing', 503);
+        }
+
+        $token = $this->request->getParam('token');
+        $remote = $this->request->getParam('remote');
+        $newRemoteId = $this->request->getParam('remote_id', $id);
+        $cloudId = $this->cloudIdManager->resolveCloudId($remote);
+
+        $qb = $this->connection->getQueryBuilder();
+        $query = $qb->update('share_external')
+            ->set('remote', $qb->createNamedParameter($cloudId->getRemote()))
+            ->set('owner', $qb->createNamedParameter($cloudId->getUser()))
+            ->set('remote_id', $qb->createNamedParameter($newRemoteId))
+            ->where($qb->expr()->eq('remote_id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('share_token', $qb->createNamedParameter($token)));
+        $affected = $query->executeStatement();
+
+        if ($affected > 0) {
+            return new Http\DataResponse(['remote' => $cloudId->getRemote(), 'owner' => $cloudId->getUser()]);
+        } else {
+            throw new OCSBadRequestException('Share not found or token invalid');
+        }
+    }
 }

apps/sharebymail/lib/ShareByMailProvider.php

Indentation +1118 added lines, -1118 removed lines

@@ -72,1129 +72,1129 @@
  */
 class ShareByMailProvider implements IShareProvider {
 
-	/** @var  IDBConnection */
-	private $dbConnection;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IManager  */
-	private $activityManager;
-
-	/** @var SettingsManager */
-	private $settingsManager;
-
-	/** @var Defaults */
-	private $defaults;
-
-	/** @var IHasher */
-	private $hasher;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var IShareManager */
-	private $shareManager;
-
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier() {
-		return 'ocMailShare';
-	}
-
-	public function __construct(IDBConnection $connection,
-								ISecureRandom $secureRandom,
-								IUserManager $userManager,
-								IRootFolder $rootFolder,
-								IL10N $l,
-								ILogger $logger,
-								IMailer $mailer,
-								IURLGenerator $urlGenerator,
-								IManager $activityManager,
-								SettingsManager $settingsManager,
-								Defaults $defaults,
-								IHasher $hasher,
-								IEventDispatcher $eventDispatcher,
-								IShareManager $shareManager) {
-		$this->dbConnection = $connection;
-		$this->secureRandom = $secureRandom;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->l = $l;
-		$this->logger = $logger;
-		$this->mailer = $mailer;
-		$this->urlGenerator = $urlGenerator;
-		$this->activityManager = $activityManager;
-		$this->settingsManager = $settingsManager;
-		$this->defaults = $defaults;
-		$this->hasher = $hasher;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(IShare $share) {
-		$shareWith = $share->getSharedWith();
-		/*
+    /** @var  IDBConnection */
+    private $dbConnection;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var IManager  */
+    private $activityManager;
+
+    /** @var SettingsManager */
+    private $settingsManager;
+
+    /** @var Defaults */
+    private $defaults;
+
+    /** @var IHasher */
+    private $hasher;
+
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+
+    /** @var IShareManager */
+    private $shareManager;
+
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier() {
+        return 'ocMailShare';
+    }
+
+    public function __construct(IDBConnection $connection,
+                                ISecureRandom $secureRandom,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder,
+                                IL10N $l,
+                                ILogger $logger,
+                                IMailer $mailer,
+                                IURLGenerator $urlGenerator,
+                                IManager $activityManager,
+                                SettingsManager $settingsManager,
+                                Defaults $defaults,
+                                IHasher $hasher,
+                                IEventDispatcher $eventDispatcher,
+                                IShareManager $shareManager) {
+        $this->dbConnection = $connection;
+        $this->secureRandom = $secureRandom;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->mailer = $mailer;
+        $this->urlGenerator = $urlGenerator;
+        $this->activityManager = $activityManager;
+        $this->settingsManager = $settingsManager;
+        $this->defaults = $defaults;
+        $this->hasher = $hasher;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * Share a path
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(IShare $share) {
+        $shareWith = $share->getSharedWith();
+        /*
 		 * Check if file is not already shared with the remote user
 		 */
-		$alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_EMAIL, $share->getNode(), 1, 0);
-		if (!empty($alreadyShared)) {
-			$message = 'Sharing %1$s failed, because this item is already shared with user %2$s';
-			$message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with user %2$s', [$share->getNode()->getName(), $shareWith]);
-			$this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
-			throw new \Exception($message_t);
-		}
-
-		// if the admin enforces a password for all mail shares we create a
-		// random password and send it to the recipient
-		$password = $share->getPassword() ?: '';
-		$passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
-		if ($passwordEnforced && empty($password)) {
-			$password = $this->autoGeneratePassword($share);
-		}
-
-		if (!empty($password)) {
-			$share->setPassword($this->hasher->hash($password));
-		}
-
-		$shareId = $this->createMailShare($share);
-		$send = $this->sendPassword($share, $password);
-		if ($passwordEnforced && $send === false) {
-			$this->sendPasswordToOwner($share, $password);
-		}
-
-		$this->createShareActivity($share);
-		$data = $this->getRawShare($shareId);
-
-		return $this->createShareObject($data);
-	}
-
-	/**
-	 * auto generate password in case of password enforcement on mail shares
-	 *
-	 * @param IShare $share
-	 * @return string
-	 * @throws \Exception
-	 */
-	protected function autoGeneratePassword($share) {
-		$initiatorUser = $this->userManager->get($share->getSharedBy());
-		$initiatorEMailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-		$allowPasswordByMail = $this->settingsManager->sendPasswordByMail();
-
-		if ($initiatorEMailAddress === null && !$allowPasswordByMail) {
-			throw new \Exception(
-				$this->l->t("We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again.")
-			);
-		}
-
-		$passwordEvent = new GenerateSecurePasswordEvent();
-		$this->eventDispatcher->dispatchTyped($passwordEvent);
-
-		$password = $passwordEvent->getPassword();
-		if ($password === null) {
-			$password = $this->secureRandom->generate(8, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
-		}
-
-		return $password;
-	}
-
-	/**
-	 * create activity if a file/folder was shared by mail
-	 *
-	 * @param IShare $share
-	 * @param string $type
-	 */
-	protected function createShareActivity(IShare $share, string $type = 'share') {
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-
-		$this->publishActivity(
-			$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_SELF : Activity::SUBJECT_UNSHARED_EMAIL_SELF,
-			[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
-			$share->getSharedBy(),
-			$share->getNode()->getId(),
-			(string) $userFolder->getRelativePath($share->getNode()->getPath())
-		);
-
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-			$fileId = $share->getNode()->getId();
-			$nodes = $ownerFolder->getById($fileId);
-			$ownerPath = $nodes[0]->getPath();
-			$this->publishActivity(
-				$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
-				[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
-				$share->getShareOwner(),
-				$fileId,
-				(string) $ownerFolder->getRelativePath($ownerPath)
-			);
-		}
-	}
-
-	/**
-	 * create activity if a file/folder was shared by mail
-	 *
-	 * @param IShare $share
-	 * @param string $sharedWith
-	 * @param bool $sendToSelf
-	 */
-	protected function createPasswordSendActivity(IShare $share, $sharedWith, $sendToSelf) {
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-
-		if ($sendToSelf) {
-			$this->publishActivity(
-				Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF,
-				[$userFolder->getRelativePath($share->getNode()->getPath())],
-				$share->getSharedBy(),
-				$share->getNode()->getId(),
-				(string) $userFolder->getRelativePath($share->getNode()->getPath())
-			);
-		} else {
-			$this->publishActivity(
-				Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND,
-				[$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
-				$share->getSharedBy(),
-				$share->getNode()->getId(),
-				(string) $userFolder->getRelativePath($share->getNode()->getPath())
-			);
-		}
-	}
-
-
-	/**
-	 * publish activity if a file/folder was shared by mail
-	 *
-	 * @param string $subject
-	 * @param array $parameters
-	 * @param string $affectedUser
-	 * @param int $fileId
-	 * @param string $filePath
-	 */
-	protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath) {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('sharebymail')
-			->setType('shared')
-			->setSubject($subject, $parameters)
-			->setAffectedUser($affectedUser)
-			->setObject('files', $fileId, $filePath);
-		$this->activityManager->publish($event);
-	}
-
-	/**
-	 * @param IShare $share
-	 * @return int
-	 * @throws \Exception
-	 */
-	protected function createMailShare(IShare $share) {
-		$share->setToken($this->generateToken());
-		$shareId = $this->addShareToDB(
-			$share->getNodeId(),
-			$share->getNodeType(),
-			$share->getSharedWith(),
-			$share->getSharedBy(),
-			$share->getShareOwner(),
-			$share->getPermissions(),
-			$share->getToken(),
-			$share->getPassword(),
-			$share->getSendPasswordByTalk(),
-			$share->getHideDownload(),
-			$share->getLabel(),
-			$share->getExpirationDate()
-		);
-
-		try {
-			$link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
-				['token' => $share->getToken()]);
-			$this->sendMailNotification(
-				$share->getNode()->getName(),
-				$link,
-				$share->getSharedBy(),
-				$share->getSharedWith(),
-				$share->getExpirationDate()
-			);
-		} catch (HintException $hintException) {
-			$this->logger->logException($hintException, [
-				'message' => 'Failed to send share by mail.',
-				'level' => ILogger::ERROR,
-				'app' => 'sharebymail',
-			]);
-			$this->removeShareFromTable($shareId);
-			throw $hintException;
-		} catch (\Exception $e) {
-			$this->logger->logException($e, [
-				'message' => 'Failed to send share by mail.',
-				'level' => ILogger::ERROR,
-				'app' => 'sharebymail',
-			]);
-			$this->removeShareFromTable($shareId);
-			throw new HintException('Failed to send share by mail',
-				$this->l->t('Failed to send share by email'));
-		}
-
-		return $shareId;
-	}
-
-	/**
-	 * @param string $filename
-	 * @param string $link
-	 * @param string $initiator
-	 * @param string $shareWith
-	 * @param \DateTime|null $expiration
-	 * @throws \Exception If mail couldn't be sent
-	 */
-	protected function sendMailNotification($filename,
-											$link,
-											$initiator,
-											$shareWith,
-											\DateTime $expiration = null) {
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientNotification', [
-			'filename' => $filename,
-			'link' => $link,
-			'initiator' => $initiatorDisplayName,
-			'expiration' => $expiration,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false);
-		$text = $this->l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
-
-		$emailTemplate->addBodyText(
-			htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')),
-			$text
-		);
-		$emailTemplate->addBodyButton(
-			$this->l->t('Open »%s«', [$filename]),
-			$link
-		);
-
-		$message->setTo([$shareWith]);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $instanceName;
-		if ($this->settingsManager->replyToInitiator()) {
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-		}
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-
-		// The "Reply-To" is set to the sharer if an mail address is configured
-		// also the default footer contains a "Do not reply" which needs to be adjusted.
-		$initiatorEmail = $initiatorUser->getEMailAddress();
-		if ($this->settingsManager->replyToInitiator() && $initiatorEmail !== null) {
-			$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-	}
-
-	/**
-	 * send password to recipient of a mail share
-	 *
-	 * @param IShare $share
-	 * @param string $password
-	 * @return bool
-	 */
-	protected function sendPassword(IShare $share, $password) {
-		$filename = $share->getNode()->getName();
-		$initiator = $share->getSharedBy();
-		$shareWith = $share->getSharedWith();
-
-		if ($password === '' || $this->settingsManager->sendPasswordByMail() === false || $share->getSendPasswordByTalk()) {
-			return false;
-		}
-
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-
-		$plainBodyPart = $this->l->t("%1\$s shared »%2\$s« with you.\nYou should have already received a separate mail with a link to access it.\n", [$initiatorDisplayName, $filename]);
-		$htmlBodyPart = $this->l->t('%1$s shared »%2$s« with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientPasswordNotification', [
-			'filename' => $filename,
-			'password' => $password,
-			'initiator' => $initiatorDisplayName,
-			'initiatorEmail' => $initiatorEmailAddress,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared to you by %2$s', [$filename, $initiatorDisplayName]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
-		$emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
-		$emailTemplate->addBodyText($this->l->t('It is protected with the following password:'));
-		$emailTemplate->addBodyText($password);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $instanceName;
-		if ($this->settingsManager->replyToInitiator()) {
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-		}
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-		if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
-			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->setTo([$shareWith]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-
-		$this->createPasswordSendActivity($share, $shareWith, false);
-
-		return true;
-	}
-
-	protected function sendNote(IShare $share) {
-		$recipient = $share->getSharedWith();
-
-
-		$filename = $share->getNode()->getName();
-		$initiator = $share->getSharedBy();
-		$note = $share->getNote();
-
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-
-		$plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
-		$htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('shareByMail.sendNote');
-
-		$emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading(htmlspecialchars($htmlHeading), $plainHeading);
-		$emailTemplate->addBodyText(htmlspecialchars($note), $note);
-
-		$link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
-			['token' => $share->getToken()]);
-		$emailTemplate->addBodyButton(
-			$this->l->t('Open »%s«', [$filename]),
-			$link
-		);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $instanceName;
-		if ($this->settingsManager->replyToInitiator()) {
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-		}
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-		if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
-			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->setTo([$recipient]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-	}
-
-	/**
-	 * send auto generated password to the owner. This happens if the admin enforces
-	 * a password for mail shares and forbid to send the password by mail to the recipient
-	 *
-	 * @param IShare $share
-	 * @param string $password
-	 * @return bool
-	 * @throws \Exception
-	 */
-	protected function sendPasswordToOwner(IShare $share, $password) {
-		$filename = $share->getNode()->getName();
-		$initiator = $this->userManager->get($share->getSharedBy());
-		$initiatorEMailAddress = ($initiator instanceof IUser) ? $initiator->getEMailAddress() : null;
-		$initiatorDisplayName = ($initiator instanceof IUser) ? $initiator->getDisplayName() : $share->getSharedBy();
-		$shareWith = $share->getSharedWith();
-
-		if ($initiatorEMailAddress === null) {
-			throw new \Exception(
-				$this->l->t("We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again.")
-			);
-		}
-
-		$bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
-
-		$message = $this->mailer->createMessage();
-		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [
-			'filename' => $filename,
-			'password' => $password,
-			'initiator' => $initiatorDisplayName,
-			'initiatorEmail' => $initiatorEMailAddress,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared by you with %2$s', [$filename, $shareWith]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
-		$emailTemplate->addBodyText($bodyPart);
-		$emailTemplate->addBodyText($this->l->t('This is the password:'));
-		$emailTemplate->addBodyText($password);
-		$emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
-		$emailTemplate->addFooter();
-
-		$instanceName = $this->defaults->getName();
-		$senderName = $this->l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName
-			]
-		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-		$message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-
-		$this->createPasswordSendActivity($share, $shareWith, true);
-
-		return true;
-	}
-
-	/**
-	 * generate share token
-	 *
-	 * @return string
-	 */
-	protected function generateToken($size = 15) {
-		$token = $this->secureRandom->generate($size, ISecureRandom::CHAR_HUMAN_READABLE);
-		return $token;
-	}
-
-	/**
-	 * Get all children of this share
-	 *
-	 * @param IShare $parent
-	 * @return IShare[]
-	 */
-	public function getChildren(IShare $parent) {
-		$children = [];
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		while ($data = $cursor->fetch()) {
-			$children[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * add share to the database and return the ID
-	 *
-	 * @param int $itemSource
-	 * @param string $itemType
-	 * @param string $shareWith
-	 * @param string $sharedBy
-	 * @param string $uidOwner
-	 * @param int $permissions
-	 * @param string $token
-	 * @param string $password
-	 * @param bool $sendPasswordByTalk
-	 * @param bool $hideDownload
-	 * @param string $label
-	 * @param \DateTime|null $expirationTime
-	 * @return int
-	 */
-	protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $password, $sendPasswordByTalk, $hideDownload, $label, $expirationTime) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->insert('share')
-			->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
-			->setValue('item_type', $qb->createNamedParameter($itemType))
-			->setValue('item_source', $qb->createNamedParameter($itemSource))
-			->setValue('file_source', $qb->createNamedParameter($itemSource))
-			->setValue('share_with', $qb->createNamedParameter($shareWith))
-			->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
-			->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
-			->setValue('permissions', $qb->createNamedParameter($permissions))
-			->setValue('token', $qb->createNamedParameter($token))
-			->setValue('password', $qb->createNamedParameter($password))
-			->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
-			->setValue('stime', $qb->createNamedParameter(time()))
-			->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT))
-			->setValue('label', $qb->createNamedParameter($label));
-
-		if ($expirationTime !== null) {
-			$qb->setValue('expiration', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATE));
-		}
-
-		/*
+        $alreadyShared = $this->getSharedWith($shareWith, IShare::TYPE_EMAIL, $share->getNode(), 1, 0);
+        if (!empty($alreadyShared)) {
+            $message = 'Sharing %1$s failed, because this item is already shared with user %2$s';
+            $message_t = $this->l->t('Sharing %1$s failed, because this item is already shared with user %2$s', [$share->getNode()->getName(), $shareWith]);
+            $this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
+            throw new \Exception($message_t);
+        }
+
+        // if the admin enforces a password for all mail shares we create a
+        // random password and send it to the recipient
+        $password = $share->getPassword() ?: '';
+        $passwordEnforced = $this->shareManager->shareApiLinkEnforcePassword();
+        if ($passwordEnforced && empty($password)) {
+            $password = $this->autoGeneratePassword($share);
+        }
+
+        if (!empty($password)) {
+            $share->setPassword($this->hasher->hash($password));
+        }
+
+        $shareId = $this->createMailShare($share);
+        $send = $this->sendPassword($share, $password);
+        if ($passwordEnforced && $send === false) {
+            $this->sendPasswordToOwner($share, $password);
+        }
+
+        $this->createShareActivity($share);
+        $data = $this->getRawShare($shareId);
+
+        return $this->createShareObject($data);
+    }
+
+    /**
+     * auto generate password in case of password enforcement on mail shares
+     *
+     * @param IShare $share
+     * @return string
+     * @throws \Exception
+     */
+    protected function autoGeneratePassword($share) {
+        $initiatorUser = $this->userManager->get($share->getSharedBy());
+        $initiatorEMailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+        $allowPasswordByMail = $this->settingsManager->sendPasswordByMail();
+
+        if ($initiatorEMailAddress === null && !$allowPasswordByMail) {
+            throw new \Exception(
+                $this->l->t("We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again.")
+            );
+        }
+
+        $passwordEvent = new GenerateSecurePasswordEvent();
+        $this->eventDispatcher->dispatchTyped($passwordEvent);
+
+        $password = $passwordEvent->getPassword();
+        if ($password === null) {
+            $password = $this->secureRandom->generate(8, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+        }
+
+        return $password;
+    }
+
+    /**
+     * create activity if a file/folder was shared by mail
+     *
+     * @param IShare $share
+     * @param string $type
+     */
+    protected function createShareActivity(IShare $share, string $type = 'share') {
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+
+        $this->publishActivity(
+            $type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_SELF : Activity::SUBJECT_UNSHARED_EMAIL_SELF,
+            [$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
+            $share->getSharedBy(),
+            $share->getNode()->getId(),
+            (string) $userFolder->getRelativePath($share->getNode()->getPath())
+        );
+
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            $ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+            $fileId = $share->getNode()->getId();
+            $nodes = $ownerFolder->getById($fileId);
+            $ownerPath = $nodes[0]->getPath();
+            $this->publishActivity(
+                $type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
+                [$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
+                $share->getShareOwner(),
+                $fileId,
+                (string) $ownerFolder->getRelativePath($ownerPath)
+            );
+        }
+    }
+
+    /**
+     * create activity if a file/folder was shared by mail
+     *
+     * @param IShare $share
+     * @param string $sharedWith
+     * @param bool $sendToSelf
+     */
+    protected function createPasswordSendActivity(IShare $share, $sharedWith, $sendToSelf) {
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+
+        if ($sendToSelf) {
+            $this->publishActivity(
+                Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF,
+                [$userFolder->getRelativePath($share->getNode()->getPath())],
+                $share->getSharedBy(),
+                $share->getNode()->getId(),
+                (string) $userFolder->getRelativePath($share->getNode()->getPath())
+            );
+        } else {
+            $this->publishActivity(
+                Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND,
+                [$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
+                $share->getSharedBy(),
+                $share->getNode()->getId(),
+                (string) $userFolder->getRelativePath($share->getNode()->getPath())
+            );
+        }
+    }
+
+
+    /**
+     * publish activity if a file/folder was shared by mail
+     *
+     * @param string $subject
+     * @param array $parameters
+     * @param string $affectedUser
+     * @param int $fileId
+     * @param string $filePath
+     */
+    protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath) {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('sharebymail')
+            ->setType('shared')
+            ->setSubject($subject, $parameters)
+            ->setAffectedUser($affectedUser)
+            ->setObject('files', $fileId, $filePath);
+        $this->activityManager->publish($event);
+    }
+
+    /**
+     * @param IShare $share
+     * @return int
+     * @throws \Exception
+     */
+    protected function createMailShare(IShare $share) {
+        $share->setToken($this->generateToken());
+        $shareId = $this->addShareToDB(
+            $share->getNodeId(),
+            $share->getNodeType(),
+            $share->getSharedWith(),
+            $share->getSharedBy(),
+            $share->getShareOwner(),
+            $share->getPermissions(),
+            $share->getToken(),
+            $share->getPassword(),
+            $share->getSendPasswordByTalk(),
+            $share->getHideDownload(),
+            $share->getLabel(),
+            $share->getExpirationDate()
+        );
+
+        try {
+            $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
+                ['token' => $share->getToken()]);
+            $this->sendMailNotification(
+                $share->getNode()->getName(),
+                $link,
+                $share->getSharedBy(),
+                $share->getSharedWith(),
+                $share->getExpirationDate()
+            );
+        } catch (HintException $hintException) {
+            $this->logger->logException($hintException, [
+                'message' => 'Failed to send share by mail.',
+                'level' => ILogger::ERROR,
+                'app' => 'sharebymail',
+            ]);
+            $this->removeShareFromTable($shareId);
+            throw $hintException;
+        } catch (\Exception $e) {
+            $this->logger->logException($e, [
+                'message' => 'Failed to send share by mail.',
+                'level' => ILogger::ERROR,
+                'app' => 'sharebymail',
+            ]);
+            $this->removeShareFromTable($shareId);
+            throw new HintException('Failed to send share by mail',
+                $this->l->t('Failed to send share by email'));
+        }
+
+        return $shareId;
+    }
+
+    /**
+     * @param string $filename
+     * @param string $link
+     * @param string $initiator
+     * @param string $shareWith
+     * @param \DateTime|null $expiration
+     * @throws \Exception If mail couldn't be sent
+     */
+    protected function sendMailNotification($filename,
+                                            $link,
+                                            $initiator,
+                                            $shareWith,
+                                            \DateTime $expiration = null) {
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientNotification', [
+            'filename' => $filename,
+            'link' => $link,
+            'initiator' => $initiatorDisplayName,
+            'expiration' => $expiration,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false);
+        $text = $this->l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
+
+        $emailTemplate->addBodyText(
+            htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')),
+            $text
+        );
+        $emailTemplate->addBodyButton(
+            $this->l->t('Open »%s«', [$filename]),
+            $link
+        );
+
+        $message->setTo([$shareWith]);
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $instanceName;
+        if ($this->settingsManager->replyToInitiator()) {
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+        }
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+
+        // The "Reply-To" is set to the sharer if an mail address is configured
+        // also the default footer contains a "Do not reply" which needs to be adjusted.
+        $initiatorEmail = $initiatorUser->getEMailAddress();
+        if ($this->settingsManager->replyToInitiator() && $initiatorEmail !== null) {
+            $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
+            $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+    }
+
+    /**
+     * send password to recipient of a mail share
+     *
+     * @param IShare $share
+     * @param string $password
+     * @return bool
+     */
+    protected function sendPassword(IShare $share, $password) {
+        $filename = $share->getNode()->getName();
+        $initiator = $share->getSharedBy();
+        $shareWith = $share->getSharedWith();
+
+        if ($password === '' || $this->settingsManager->sendPasswordByMail() === false || $share->getSendPasswordByTalk()) {
+            return false;
+        }
+
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+
+        $plainBodyPart = $this->l->t("%1\$s shared »%2\$s« with you.\nYou should have already received a separate mail with a link to access it.\n", [$initiatorDisplayName, $filename]);
+        $htmlBodyPart = $this->l->t('%1$s shared »%2$s« with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientPasswordNotification', [
+            'filename' => $filename,
+            'password' => $password,
+            'initiator' => $initiatorDisplayName,
+            'initiatorEmail' => $initiatorEmailAddress,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared to you by %2$s', [$filename, $initiatorDisplayName]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
+        $emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
+        $emailTemplate->addBodyText($this->l->t('It is protected with the following password:'));
+        $emailTemplate->addBodyText($password);
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $instanceName;
+        if ($this->settingsManager->replyToInitiator()) {
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+        }
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+        if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
+            $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+            $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->setTo([$shareWith]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+
+        $this->createPasswordSendActivity($share, $shareWith, false);
+
+        return true;
+    }
+
+    protected function sendNote(IShare $share) {
+        $recipient = $share->getSharedWith();
+
+
+        $filename = $share->getNode()->getName();
+        $initiator = $share->getSharedBy();
+        $note = $share->getNote();
+
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+
+        $plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
+        $htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('shareByMail.sendNote');
+
+        $emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading(htmlspecialchars($htmlHeading), $plainHeading);
+        $emailTemplate->addBodyText(htmlspecialchars($note), $note);
+
+        $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
+            ['token' => $share->getToken()]);
+        $emailTemplate->addBodyButton(
+            $this->l->t('Open »%s«', [$filename]),
+            $link
+        );
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $instanceName;
+        if ($this->settingsManager->replyToInitiator()) {
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+        }
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+        if ($this->settingsManager->replyToInitiator() && $initiatorEmailAddress !== null) {
+            $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+            $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->setTo([$recipient]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+    }
+
+    /**
+     * send auto generated password to the owner. This happens if the admin enforces
+     * a password for mail shares and forbid to send the password by mail to the recipient
+     *
+     * @param IShare $share
+     * @param string $password
+     * @return bool
+     * @throws \Exception
+     */
+    protected function sendPasswordToOwner(IShare $share, $password) {
+        $filename = $share->getNode()->getName();
+        $initiator = $this->userManager->get($share->getSharedBy());
+        $initiatorEMailAddress = ($initiator instanceof IUser) ? $initiator->getEMailAddress() : null;
+        $initiatorDisplayName = ($initiator instanceof IUser) ? $initiator->getDisplayName() : $share->getSharedBy();
+        $shareWith = $share->getSharedWith();
+
+        if ($initiatorEMailAddress === null) {
+            throw new \Exception(
+                $this->l->t("We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again.")
+            );
+        }
+
+        $bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
+
+        $message = $this->mailer->createMessage();
+        $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [
+            'filename' => $filename,
+            'password' => $password,
+            'initiator' => $initiatorDisplayName,
+            'initiatorEmail' => $initiatorEMailAddress,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared by you with %2$s', [$filename, $shareWith]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
+        $emailTemplate->addBodyText($bodyPart);
+        $emailTemplate->addBodyText($this->l->t('This is the password:'));
+        $emailTemplate->addBodyText($password);
+        $emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
+        $emailTemplate->addFooter();
+
+        $instanceName = $this->defaults->getName();
+        $senderName = $this->l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName
+            ]
+        );
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+        $message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+
+        $this->createPasswordSendActivity($share, $shareWith, true);
+
+        return true;
+    }
+
+    /**
+     * generate share token
+     *
+     * @return string
+     */
+    protected function generateToken($size = 15) {
+        $token = $this->secureRandom->generate($size, ISecureRandom::CHAR_HUMAN_READABLE);
+        return $token;
+    }
+
+    /**
+     * Get all children of this share
+     *
+     * @param IShare $parent
+     * @return IShare[]
+     */
+    public function getChildren(IShare $parent) {
+        $children = [];
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        while ($data = $cursor->fetch()) {
+            $children[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * add share to the database and return the ID
+     *
+     * @param int $itemSource
+     * @param string $itemType
+     * @param string $shareWith
+     * @param string $sharedBy
+     * @param string $uidOwner
+     * @param int $permissions
+     * @param string $token
+     * @param string $password
+     * @param bool $sendPasswordByTalk
+     * @param bool $hideDownload
+     * @param string $label
+     * @param \DateTime|null $expirationTime
+     * @return int
+     */
+    protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $password, $sendPasswordByTalk, $hideDownload, $label, $expirationTime) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->insert('share')
+            ->setValue('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
+            ->setValue('item_type', $qb->createNamedParameter($itemType))
+            ->setValue('item_source', $qb->createNamedParameter($itemSource))
+            ->setValue('file_source', $qb->createNamedParameter($itemSource))
+            ->setValue('share_with', $qb->createNamedParameter($shareWith))
+            ->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
+            ->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
+            ->setValue('permissions', $qb->createNamedParameter($permissions))
+            ->setValue('token', $qb->createNamedParameter($token))
+            ->setValue('password', $qb->createNamedParameter($password))
+            ->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
+            ->setValue('stime', $qb->createNamedParameter(time()))
+            ->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT))
+            ->setValue('label', $qb->createNamedParameter($label));
+
+        if ($expirationTime !== null) {
+            $qb->setValue('expiration', $qb->createNamedParameter($expirationTime, IQueryBuilder::PARAM_DATE));
+        }
+
+        /*
 		 * Added to fix https://github.com/owncloud/core/issues/22215
 		 * Can be removed once we get rid of ajax/share.php
 		 */
-		$qb->setValue('file_target', $qb->createNamedParameter(''));
-
-		$qb->executeStatement();
-		return $qb->getLastInsertId();
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param IShare $share
-	 * @param string|null $plainTextPassword
-	 * @return IShare The share object
-	 */
-	public function update(IShare $share, $plainTextPassword = null) {
-		$originalShare = $this->getShareById($share->getId());
-
-		// a real password was given
-		$validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
-
-		if ($validPassword && ($originalShare->getPassword() !== $share->getPassword() ||
-								($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) {
-			$this->sendPassword($share, $plainTextPassword);
-		}
-		/*
+        $qb->setValue('file_target', $qb->createNamedParameter(''));
+
+        $qb->executeStatement();
+        return $qb->getLastInsertId();
+    }
+
+    /**
+     * Update a share
+     *
+     * @param IShare $share
+     * @param string|null $plainTextPassword
+     * @return IShare The share object
+     */
+    public function update(IShare $share, $plainTextPassword = null) {
+        $originalShare = $this->getShareById($share->getId());
+
+        // a real password was given
+        $validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
+
+        if ($validPassword && ($originalShare->getPassword() !== $share->getPassword() ||
+                                ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) {
+            $this->sendPassword($share, $plainTextPassword);
+        }
+        /*
 		 * We allow updating the permissions and password of mail shares
 		 */
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-			->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-			->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-			->set('password', $qb->createNamedParameter($share->getPassword()))
-			->set('label', $qb->createNamedParameter($share->getLabel()))
-			->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
-			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-			->set('note', $qb->createNamedParameter($share->getNote()))
-			->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
-			->executeStatement();
-
-		if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
-			$this->sendNote($share);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(IShare $share, $recipient) {
-		/**
-		 * nothing to do here, mail shares are only outgoing shares
-		 */
-		return $share;
-	}
-
-	/**
-	 * Delete a share (owner unShares the file)
-	 *
-	 * @param IShare $share
-	 */
-	public function delete(IShare $share) {
-		try {
-			$this->createShareActivity($share, 'unshare');
-		} catch (\Exception $e) {
-		}
-
-		$this->removeShareFromTable($share->getId());
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteFromSelf(IShare $share, $recipient) {
-		// nothing to do here, mail shares are only outgoing shares
-	}
-
-	public function restore(IShare $share, string $recipient): IShare {
-		throw new GenericShareException('not implemented');
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			//Special case for old shares created via the web UI
-			$or1 = $qb->expr()->andX(
-				$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-				$qb->expr()->isNull('uid_initiator')
-			);
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
-					$or1
-				)
-			);
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-
-		$qb->setFirstResult($offset);
-		$qb->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
-
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @return IShare[]
-	 */
-	public function getSharesByPath(Node $path) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->executeQuery();
-
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
-		/** @var IShare[] $shares */
-		$shares = [];
-
-		//Get shares directly with this user
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		// Order by id
-		$qb->orderBy('id');
-
-		// Set limit and offset
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-		$qb->setFirstResult($offset);
-
-		$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
-		$qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
-
-		// Filter by node if provided
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		$cursor = $qb->executeQuery();
-
-		while ($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return IShare
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->executeQuery();
-
-		$data = $cursor->fetch();
-
-		if ($data === false) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		return $share;
-	}
-
-	/**
-	 * remove share from table
-	 *
-	 * @param string $shareId
-	 */
-	protected function removeShareFromTable($shareId) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
-		$qb->executeStatement();
-	}
-
-	/**
-	 * Create a share object from an database row
-	 *
-	 * @param array $data
-	 * @return IShare
-	 * @throws InvalidShare
-	 * @throws ShareNotFound
-	 */
-	protected function createShareObject($data) {
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
-			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
-			->setNote($data['note'])
-			->setToken($data['token']);
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-		$share->setSharedWith($data['share_with']);
-		$share->setPassword($data['password']);
-		$share->setLabel($data['label']);
-		$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-		$share->setHideDownload((bool)$data['hide_download']);
-
-		if ($data['uid_initiator'] !== null) {
-			$share->setShareOwner($data['uid_owner']);
-			$share->setSharedBy($data['uid_initiator']);
-		} else {
-			//OLD SHARE
-			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
-
-			$owner = $path->getOwner();
-			$share->setShareOwner($owner->getUID());
-		}
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			if ($expiration !== false) {
-				$share->setExpirationDate($expiration);
-			}
-		}
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		$share->setProviderId($this->identifier());
-
-		return $share;
-	}
-
-	/**
-	 * Get the node with file $id for $user
-	 *
-	 * @param string $userId
-	 * @param int $id
-	 * @return \OCP\Files\File|\OCP\Files\Folder
-	 * @throws InvalidShare
-	 */
-	private function getNode($userId, $id) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($userId);
-		} catch (NoUserException $e) {
-			throw new InvalidShare();
-		}
-
-		$nodes = $userFolder->getById($id);
-
-		if (empty($nodes)) {
-			throw new InvalidShare();
-		}
-
-		return $nodes[0];
-	}
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 *
-	 * @param string $uid
-	 * @param int $shareType
-	 */
-	public function userDeleted($uid, $shareType) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
-			->executeStatement();
-	}
-
-	/**
-	 * This provider does not support group shares
-	 *
-	 * @param string $gid
-	 */
-	public function groupDeleted($gid) {
-	}
-
-	/**
-	 * This provider does not support group shares
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-	}
-
-	/**
-	 * get database row of a give share
-	 *
-	 * @param $id
-	 * @return array
-	 * @throws ShareNotFound
-	 */
-	protected function getRawShare($id) {
-
-		// Now fetch the inserted share and create a complete share object
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$cursor = $qb->executeQuery();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound;
-		}
-
-		return $data;
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share', 's')
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
-			);
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
-		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
-
-		$qb->orderBy('id');
-
-		$cursor = $qb->executeQuery();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[$data['fileid']][] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAccessList($nodes, $currentAccess) {
-		$ids = [];
-		foreach ($nodes as $node) {
-			$ids[] = $node->getId();
-		}
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('share_with')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->setMaxResults(1);
-		$cursor = $qb->executeQuery();
-
-		$mail = $cursor->fetch() !== false;
-		$cursor->closeCursor();
-
-		return ['public' => $mail];
-	}
-
-	public function getAllShares(): iterable {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where(
-				$qb->expr()->orX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_EMAIL))
-				)
-			);
-
-		$cursor = $qb->executeQuery();
-		while ($data = $cursor->fetch()) {
-			try {
-				$share = $this->createShareObject($data);
-			} catch (InvalidShare $e) {
-				continue;
-			} catch (ShareNotFound $e) {
-				continue;
-			}
-
-			yield $share;
-		}
-		$cursor->closeCursor();
-	}
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->update('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+            ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+            ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+            ->set('password', $qb->createNamedParameter($share->getPassword()))
+            ->set('label', $qb->createNamedParameter($share->getLabel()))
+            ->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
+            ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+            ->set('note', $qb->createNamedParameter($share->getNote()))
+            ->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
+            ->executeStatement();
+
+        if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
+            $this->sendNote($share);
+        }
+
+        return $share;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(IShare $share, $recipient) {
+        /**
+         * nothing to do here, mail shares are only outgoing shares
+         */
+        return $share;
+    }
+
+    /**
+     * Delete a share (owner unShares the file)
+     *
+     * @param IShare $share
+     */
+    public function delete(IShare $share) {
+        try {
+            $this->createShareActivity($share, 'unshare');
+        } catch (\Exception $e) {
+        }
+
+        $this->removeShareFromTable($share->getId());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteFromSelf(IShare $share, $recipient) {
+        // nothing to do here, mail shares are only outgoing shares
+    }
+
+    public function restore(IShare $share, string $recipient): IShare {
+        throw new GenericShareException('not implemented');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            //Special case for old shares created via the web UI
+            $or1 = $qb->expr()->andX(
+                $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                $qb->expr()->isNull('uid_initiator')
+            );
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
+                    $or1
+                )
+            );
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+
+        $qb->setFirstResult($offset);
+        $qb->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
+
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @return IShare[]
+     */
+    public function getSharesByPath(Node $path) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->executeQuery();
+
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+        /** @var IShare[] $shares */
+        $shares = [];
+
+        //Get shares directly with this user
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        // Order by id
+        $qb->orderBy('id');
+
+        // Set limit and offset
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+        $qb->setFirstResult($offset);
+
+        $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)));
+        $qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
+
+        // Filter by node if provided
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        $cursor = $qb->executeQuery();
+
+        while ($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return IShare
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->executeQuery();
+
+        $data = $cursor->fetch();
+
+        if ($data === false) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        return $share;
+    }
+
+    /**
+     * remove share from table
+     *
+     * @param string $shareId
+     */
+    protected function removeShareFromTable($shareId) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
+        $qb->executeStatement();
+    }
+
+    /**
+     * Create a share object from an database row
+     *
+     * @param array $data
+     * @return IShare
+     * @throws InvalidShare
+     * @throws ShareNotFound
+     */
+    protected function createShareObject($data) {
+        $share = new Share($this->rootFolder, $this->userManager);
+        $share->setId((int)$data['id'])
+            ->setShareType((int)$data['share_type'])
+            ->setPermissions((int)$data['permissions'])
+            ->setTarget($data['file_target'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setNote($data['note'])
+            ->setToken($data['token']);
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+        $share->setSharedWith($data['share_with']);
+        $share->setPassword($data['password']);
+        $share->setLabel($data['label']);
+        $share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+        $share->setHideDownload((bool)$data['hide_download']);
+
+        if ($data['uid_initiator'] !== null) {
+            $share->setShareOwner($data['uid_owner']);
+            $share->setSharedBy($data['uid_initiator']);
+        } else {
+            //OLD SHARE
+            $share->setSharedBy($data['uid_owner']);
+            $path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+
+            $owner = $path->getOwner();
+            $share->setShareOwner($owner->getUID());
+        }
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            if ($expiration !== false) {
+                $share->setExpirationDate($expiration);
+            }
+        }
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        $share->setProviderId($this->identifier());
+
+        return $share;
+    }
+
+    /**
+     * Get the node with file $id for $user
+     *
+     * @param string $userId
+     * @param int $id
+     * @return \OCP\Files\File|\OCP\Files\Folder
+     * @throws InvalidShare
+     */
+    private function getNode($userId, $id) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($userId);
+        } catch (NoUserException $e) {
+            throw new InvalidShare();
+        }
+
+        $nodes = $userFolder->getById($id);
+
+        if (empty($nodes)) {
+            throw new InvalidShare();
+        }
+
+        return $nodes[0];
+    }
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     *
+     * @param string $uid
+     * @param int $shareType
+     */
+    public function userDeleted($uid, $shareType) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
+            ->executeStatement();
+    }
+
+    /**
+     * This provider does not support group shares
+     *
+     * @param string $gid
+     */
+    public function groupDeleted($gid) {
+    }
+
+    /**
+     * This provider does not support group shares
+     *
+     * @param string $uid
+     * @param string $gid
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+    }
+
+    /**
+     * get database row of a give share
+     *
+     * @param $id
+     * @return array
+     * @throws ShareNotFound
+     */
+    protected function getRawShare($id) {
+
+        // Now fetch the inserted share and create a complete share object
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $cursor = $qb->executeQuery();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound;
+        }
+
+        return $data;
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share', 's')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL))
+            );
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+        $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
+
+        $qb->orderBy('id');
+
+        $cursor = $qb->executeQuery();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[$data['fileid']][] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAccessList($nodes, $currentAccess) {
+        $ids = [];
+        foreach ($nodes as $node) {
+            $ids[] = $node->getId();
+        }
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('share_with')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_EMAIL)))
+            ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->setMaxResults(1);
+        $cursor = $qb->executeQuery();
+
+        $mail = $cursor->fetch() !== false;
+        $cursor->closeCursor();
+
+        return ['public' => $mail];
+    }
+
+    public function getAllShares(): iterable {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_EMAIL))
+                )
+            );
+
+        $cursor = $qb->executeQuery();
+        while ($data = $cursor->fetch()) {
+            try {
+                $share = $this->createShareObject($data);
+            } catch (InvalidShare $e) {
+                continue;
+            } catch (ShareNotFound $e) {
+                continue;
+            }
+
+            yield $share;
+        }
+        $cursor->closeCursor();
+    }
 }

lib/public/AppFramework/Db/QBMapper.php

Indentation +304 added lines, -304 removed lines

@@ -44,308 +44,308 @@
  */
 abstract class QBMapper {
 
-	/** @var string */
-	protected $tableName;
-
-	/** @var string|class-string<T> */
-	protected $entityClass;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/**
-	 * @param IDBConnection $db Instance of the Db abstraction layer
-	 * @param string $tableName the name of the table. set this to allow entity
-	 * @param string|null $entityClass the name of the entity that the sql should be
-	 * @psalm-param class-string<T>|null $entityClass the name of the entity that the sql should be
-	 * mapped to queries without using sql
-	 * @since 14.0.0
-	 */
-	public function __construct(IDBConnection $db, string $tableName, string $entityClass = null) {
-		$this->db = $db;
-		$this->tableName = $tableName;
-
-		// if not given set the entity name to the class without the mapper part
-		// cache it here for later use since reflection is slow
-		if ($entityClass === null) {
-			$this->entityClass = str_replace('Mapper', '', \get_class($this));
-		} else {
-			$this->entityClass = $entityClass;
-		}
-	}
-
-
-	/**
-	 * @return string the table name
-	 * @since 14.0.0
-	 */
-	public function getTableName(): string {
-		return $this->tableName;
-	}
-
-
-	/**
-	 * Deletes an entity from the table
-	 * @param Entity $entity the entity that should be deleted
-	 * @psalm-param T $entity the entity that should be deleted
-	 * @return Entity the deleted entity
-	 * @psalm-return T the deleted entity
-	 * @since 14.0.0
-	 */
-	public function delete(Entity $entity): Entity {
-		$qb = $this->db->getQueryBuilder();
-
-		$idType = $this->getParameterTypeForProperty($entity, 'id');
-
-		$qb->delete($this->tableName)
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($entity->getId(), $idType))
-			);
-		$qb->executeStatement();
-		return $entity;
-	}
-
-
-	/**
-	 * Creates a new entry in the db from an entity
-	 * @param Entity $entity the entity that should be created
-	 * @psalm-param T $entity the entity that should be created
-	 * @return Entity the saved entity with the set id
-	 * @psalm-return T the saved entity with the set id
-	 * @since 14.0.0
-	 */
-	public function insert(Entity $entity): Entity {
-		// get updated fields to save, fields have to be set using a setter to
-		// be saved
-		$properties = $entity->getUpdatedFields();
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->insert($this->tableName);
-
-		// build the fields
-		foreach ($properties as $property => $updated) {
-			$column = $entity->propertyToColumn($property);
-			$getter = 'get' . ucfirst($property);
-			$value = $entity->$getter();
-
-			$type = $this->getParameterTypeForProperty($entity, $property);
-			$qb->setValue($column, $qb->createNamedParameter($value, $type));
-		}
-
-		$qb->executeStatement();
-
-		if ($entity->id === null) {
-			// When autoincrement is used id is always an int
-			$entity->setId($qb->getLastInsertId());
-		}
-
-		return $entity;
-	}
-
-	/**
-	 * Tries to creates a new entry in the db from an entity and
-	 * updates an existing entry if duplicate keys are detected
-	 * by the database
-	 *
-	 * @param Entity $entity the entity that should be created/updated
-	 * @psalm-param T $entity the entity that should be created/updated
-	 * @return Entity the saved entity with the (new) id
-	 * @psalm-return T the saved entity with the (new) id
-	 * @throws \InvalidArgumentException if entity has no id
-	 * @since 15.0.0
-	 */
-	public function insertOrUpdate(Entity $entity): Entity {
-		try {
-			return $this->insert($entity);
-		} catch (Exception $ex) {
-			if ($ex->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-				return $this->update($entity);
-			}
-			throw $ex;
-		}
-	}
-
-	/**
-	 * Updates an entry in the db from an entity
-	 * @throws \InvalidArgumentException if entity has no id
-	 * @param Entity $entity the entity that should be created
-	 * @psalm-param T $entity the entity that should be created
-	 * @return Entity the saved entity with the set id
-	 * @psalm-return T the saved entity with the set id
-	 * @since 14.0.0
-	 */
-	public function update(Entity $entity): Entity {
-		// if entity wasn't changed it makes no sense to run a db query
-		$properties = $entity->getUpdatedFields();
-		if (\count($properties) === 0) {
-			return $entity;
-		}
-
-		// entity needs an id
-		$id = $entity->getId();
-		if ($id === null) {
-			throw new \InvalidArgumentException(
-				'Entity which should be updated has no id');
-		}
-
-		// get updated fields to save, fields have to be set using a setter to
-		// be saved
-		// do not update the id field
-		unset($properties['id']);
-
-		$qb = $this->db->getQueryBuilder();
-		$qb->update($this->tableName);
-
-		// build the fields
-		foreach ($properties as $property => $updated) {
-			$column = $entity->propertyToColumn($property);
-			$getter = 'get' . ucfirst($property);
-			$value = $entity->$getter();
-
-			$type = $this->getParameterTypeForProperty($entity, $property);
-			$qb->set($column, $qb->createNamedParameter($value, $type));
-		}
-
-		$idType = $this->getParameterTypeForProperty($entity, 'id');
-
-		$qb->where(
-			$qb->expr()->eq('id', $qb->createNamedParameter($id, $idType))
-		);
-		$qb->executeStatement();
-
-		return $entity;
-	}
-
-	/**
-	 * Returns the type parameter for the QueryBuilder for a specific property
-	 * of the $entity
-	 *
-	 * @param Entity $entity   The entity to get the types from
-	 * @psalm-param T $entity
-	 * @param string $property The property of $entity to get the type for
-	 * @return int
-	 * @since 16.0.0
-	 */
-	protected function getParameterTypeForProperty(Entity $entity, string $property): int {
-		$types = $entity->getFieldTypes();
-
-		if (!isset($types[ $property ])) {
-			return IQueryBuilder::PARAM_STR;
-		}
-
-		switch ($types[ $property ]) {
-			case 'int':
-			case 'integer':
-				return IQueryBuilder::PARAM_INT;
-			case 'string':
-				return IQueryBuilder::PARAM_STR;
-			case 'bool':
-			case 'boolean':
-				return IQueryBuilder::PARAM_BOOL;
-			case 'blob':
-				return IQueryBuilder::PARAM_LOB;
-		}
-
-		return IQueryBuilder::PARAM_STR;
-	}
-
-	/**
-	 * Returns an db result and throws exceptions when there are more or less
-	 * results
-	 *
-	 * @see findEntity
-	 *
-	 * @param IQueryBuilder $query
-	 * @throws DoesNotExistException if the item does not exist
-	 * @throws MultipleObjectsReturnedException if more than one item exist
-	 * @return array the result as row
-	 * @since 14.0.0
-	 */
-	protected function findOneQuery(IQueryBuilder $query): array {
-		$result = $query->executeQuery();
-
-		$row = $result->fetch();
-		if ($row === false) {
-			$result->closeCursor();
-			$msg = $this->buildDebugMessage(
-				'Did expect one result but found none when executing', $query
-			);
-			throw new DoesNotExistException($msg);
-		}
-
-		$row2 = $result->fetch();
-		$result->closeCursor();
-		if ($row2 !== false) {
-			$msg = $this->buildDebugMessage(
-				'Did not expect more than one result when executing', $query
-			);
-			throw new MultipleObjectsReturnedException($msg);
-		}
-
-		return $row;
-	}
-
-	/**
-	 * @param string $msg
-	 * @param IQueryBuilder $sql
-	 * @return string
-	 * @since 14.0.0
-	 */
-	private function buildDebugMessage(string $msg, IQueryBuilder $sql): string {
-		return $msg .
-			': query "' . $sql->getSQL() . '"; ';
-	}
-
-
-	/**
-	 * Creates an entity from a row. Automatically determines the entity class
-	 * from the current mapper name (MyEntityMapper -> MyEntity)
-	 *
-	 * @param array $row the row which should be converted to an entity
-	 * @return Entity the entity
-	 * @psalm-return T the entity
-	 * @since 14.0.0
-	 */
-	protected function mapRowToEntity(array $row): Entity {
-		return \call_user_func($this->entityClass .'::fromRow', $row);
-	}
-
-
-	/**
-	 * Runs a sql query and returns an array of entities
-	 *
-	 * @param IQueryBuilder $query
-	 * @return Entity[] all fetched entities
-	 * @psalm-return T[] all fetched entities
-	 * @since 14.0.0
-	 */
-	protected function findEntities(IQueryBuilder $query): array {
-		$result = $query->executeQuery();
-
-		$entities = [];
-
-		while ($row = $result->fetch()) {
-			$entities[] = $this->mapRowToEntity($row);
-		}
-
-		$result->closeCursor();
-
-		return $entities;
-	}
-
-
-	/**
-	 * Returns an db result and throws exceptions when there are more or less
-	 * results
-	 *
-	 * @param IQueryBuilder $query
-	 * @throws DoesNotExistException if the item does not exist
-	 * @throws MultipleObjectsReturnedException if more than one item exist
-	 * @return Entity the entity
-	 * @psalm-return T the entity
-	 * @since 14.0.0
-	 */
-	protected function findEntity(IQueryBuilder $query): Entity {
-		return $this->mapRowToEntity($this->findOneQuery($query));
-	}
+    /** @var string */
+    protected $tableName;
+
+    /** @var string|class-string<T> */
+    protected $entityClass;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /**
+     * @param IDBConnection $db Instance of the Db abstraction layer
+     * @param string $tableName the name of the table. set this to allow entity
+     * @param string|null $entityClass the name of the entity that the sql should be
+     * @psalm-param class-string<T>|null $entityClass the name of the entity that the sql should be
+     * mapped to queries without using sql
+     * @since 14.0.0
+     */
+    public function __construct(IDBConnection $db, string $tableName, string $entityClass = null) {
+        $this->db = $db;
+        $this->tableName = $tableName;
+
+        // if not given set the entity name to the class without the mapper part
+        // cache it here for later use since reflection is slow
+        if ($entityClass === null) {
+            $this->entityClass = str_replace('Mapper', '', \get_class($this));
+        } else {
+            $this->entityClass = $entityClass;
+        }
+    }
+
+
+    /**
+     * @return string the table name
+     * @since 14.0.0
+     */
+    public function getTableName(): string {
+        return $this->tableName;
+    }
+
+
+    /**
+     * Deletes an entity from the table
+     * @param Entity $entity the entity that should be deleted
+     * @psalm-param T $entity the entity that should be deleted
+     * @return Entity the deleted entity
+     * @psalm-return T the deleted entity
+     * @since 14.0.0
+     */
+    public function delete(Entity $entity): Entity {
+        $qb = $this->db->getQueryBuilder();
+
+        $idType = $this->getParameterTypeForProperty($entity, 'id');
+
+        $qb->delete($this->tableName)
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($entity->getId(), $idType))
+            );
+        $qb->executeStatement();
+        return $entity;
+    }
+
+
+    /**
+     * Creates a new entry in the db from an entity
+     * @param Entity $entity the entity that should be created
+     * @psalm-param T $entity the entity that should be created
+     * @return Entity the saved entity with the set id
+     * @psalm-return T the saved entity with the set id
+     * @since 14.0.0
+     */
+    public function insert(Entity $entity): Entity {
+        // get updated fields to save, fields have to be set using a setter to
+        // be saved
+        $properties = $entity->getUpdatedFields();
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->insert($this->tableName);
+
+        // build the fields
+        foreach ($properties as $property => $updated) {
+            $column = $entity->propertyToColumn($property);
+            $getter = 'get' . ucfirst($property);
+            $value = $entity->$getter();
+
+            $type = $this->getParameterTypeForProperty($entity, $property);
+            $qb->setValue($column, $qb->createNamedParameter($value, $type));
+        }
+
+        $qb->executeStatement();
+
+        if ($entity->id === null) {
+            // When autoincrement is used id is always an int
+            $entity->setId($qb->getLastInsertId());
+        }
+
+        return $entity;
+    }
+
+    /**
+     * Tries to creates a new entry in the db from an entity and
+     * updates an existing entry if duplicate keys are detected
+     * by the database
+     *
+     * @param Entity $entity the entity that should be created/updated
+     * @psalm-param T $entity the entity that should be created/updated
+     * @return Entity the saved entity with the (new) id
+     * @psalm-return T the saved entity with the (new) id
+     * @throws \InvalidArgumentException if entity has no id
+     * @since 15.0.0
+     */
+    public function insertOrUpdate(Entity $entity): Entity {
+        try {
+            return $this->insert($entity);
+        } catch (Exception $ex) {
+            if ($ex->getReason() === Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                return $this->update($entity);
+            }
+            throw $ex;
+        }
+    }
+
+    /**
+     * Updates an entry in the db from an entity
+     * @throws \InvalidArgumentException if entity has no id
+     * @param Entity $entity the entity that should be created
+     * @psalm-param T $entity the entity that should be created
+     * @return Entity the saved entity with the set id
+     * @psalm-return T the saved entity with the set id
+     * @since 14.0.0
+     */
+    public function update(Entity $entity): Entity {
+        // if entity wasn't changed it makes no sense to run a db query
+        $properties = $entity->getUpdatedFields();
+        if (\count($properties) === 0) {
+            return $entity;
+        }
+
+        // entity needs an id
+        $id = $entity->getId();
+        if ($id === null) {
+            throw new \InvalidArgumentException(
+                'Entity which should be updated has no id');
+        }
+
+        // get updated fields to save, fields have to be set using a setter to
+        // be saved
+        // do not update the id field
+        unset($properties['id']);
+
+        $qb = $this->db->getQueryBuilder();
+        $qb->update($this->tableName);
+
+        // build the fields
+        foreach ($properties as $property => $updated) {
+            $column = $entity->propertyToColumn($property);
+            $getter = 'get' . ucfirst($property);
+            $value = $entity->$getter();
+
+            $type = $this->getParameterTypeForProperty($entity, $property);
+            $qb->set($column, $qb->createNamedParameter($value, $type));
+        }
+
+        $idType = $this->getParameterTypeForProperty($entity, 'id');
+
+        $qb->where(
+            $qb->expr()->eq('id', $qb->createNamedParameter($id, $idType))
+        );
+        $qb->executeStatement();
+
+        return $entity;
+    }
+
+    /**
+     * Returns the type parameter for the QueryBuilder for a specific property
+     * of the $entity
+     *
+     * @param Entity $entity   The entity to get the types from
+     * @psalm-param T $entity
+     * @param string $property The property of $entity to get the type for
+     * @return int
+     * @since 16.0.0
+     */
+    protected function getParameterTypeForProperty(Entity $entity, string $property): int {
+        $types = $entity->getFieldTypes();
+
+        if (!isset($types[ $property ])) {
+            return IQueryBuilder::PARAM_STR;
+        }
+
+        switch ($types[ $property ]) {
+            case 'int':
+            case 'integer':
+                return IQueryBuilder::PARAM_INT;
+            case 'string':
+                return IQueryBuilder::PARAM_STR;
+            case 'bool':
+            case 'boolean':
+                return IQueryBuilder::PARAM_BOOL;
+            case 'blob':
+                return IQueryBuilder::PARAM_LOB;
+        }
+
+        return IQueryBuilder::PARAM_STR;
+    }
+
+    /**
+     * Returns an db result and throws exceptions when there are more or less
+     * results
+     *
+     * @see findEntity
+     *
+     * @param IQueryBuilder $query
+     * @throws DoesNotExistException if the item does not exist
+     * @throws MultipleObjectsReturnedException if more than one item exist
+     * @return array the result as row
+     * @since 14.0.0
+     */
+    protected function findOneQuery(IQueryBuilder $query): array {
+        $result = $query->executeQuery();
+
+        $row = $result->fetch();
+        if ($row === false) {
+            $result->closeCursor();
+            $msg = $this->buildDebugMessage(
+                'Did expect one result but found none when executing', $query
+            );
+            throw new DoesNotExistException($msg);
+        }
+
+        $row2 = $result->fetch();
+        $result->closeCursor();
+        if ($row2 !== false) {
+            $msg = $this->buildDebugMessage(
+                'Did not expect more than one result when executing', $query
+            );
+            throw new MultipleObjectsReturnedException($msg);
+        }
+
+        return $row;
+    }
+
+    /**
+     * @param string $msg
+     * @param IQueryBuilder $sql
+     * @return string
+     * @since 14.0.0
+     */
+    private function buildDebugMessage(string $msg, IQueryBuilder $sql): string {
+        return $msg .
+            ': query "' . $sql->getSQL() . '"; ';
+    }
+
+
+    /**
+     * Creates an entity from a row. Automatically determines the entity class
+     * from the current mapper name (MyEntityMapper -> MyEntity)
+     *
+     * @param array $row the row which should be converted to an entity
+     * @return Entity the entity
+     * @psalm-return T the entity
+     * @since 14.0.0
+     */
+    protected function mapRowToEntity(array $row): Entity {
+        return \call_user_func($this->entityClass .'::fromRow', $row);
+    }
+
+
+    /**
+     * Runs a sql query and returns an array of entities
+     *
+     * @param IQueryBuilder $query
+     * @return Entity[] all fetched entities
+     * @psalm-return T[] all fetched entities
+     * @since 14.0.0
+     */
+    protected function findEntities(IQueryBuilder $query): array {
+        $result = $query->executeQuery();
+
+        $entities = [];
+
+        while ($row = $result->fetch()) {
+            $entities[] = $this->mapRowToEntity($row);
+        }
+
+        $result->closeCursor();
+
+        return $entities;
+    }
+
+
+    /**
+     * Returns an db result and throws exceptions when there are more or less
+     * results
+     *
+     * @param IQueryBuilder $query
+     * @throws DoesNotExistException if the item does not exist
+     * @throws MultipleObjectsReturnedException if more than one item exist
+     * @return Entity the entity
+     * @psalm-return T the entity
+     * @since 14.0.0
+     */
+    protected function findEntity(IQueryBuilder $query): Entity {
+        return $this->mapRowToEntity($this->findOneQuery($query));
+    }
 }

lib/public/DB/QueryBuilder/IQueryBuilder.php

Indentation +970 added lines, -970 removed lines

@@ -40,974 +40,974 @@
  */
 interface IQueryBuilder {
 
-	/**
-	 * @since 9.0.0
-	 */
-	public const PARAM_NULL = \PDO::PARAM_NULL;
-	/**
-	 * @since 9.0.0
-	 */
-	public const PARAM_BOOL = \PDO::PARAM_BOOL;
-	/**
-	 * @since 9.0.0
-	 */
-	public const PARAM_INT = \PDO::PARAM_INT;
-	/**
-	 * @since 9.0.0
-	 */
-	public const PARAM_STR = \PDO::PARAM_STR;
-	/**
-	 * @since 9.0.0
-	 */
-	public const PARAM_LOB = \PDO::PARAM_LOB;
-	/**
-	 * @since 9.0.0
-	 */
-	public const PARAM_DATE = 'datetime';
-
-	/**
-	 * @since 9.0.0
-	 */
-	public const PARAM_INT_ARRAY = Connection::PARAM_INT_ARRAY;
-	/**
-	 * @since 9.0.0
-	 */
-	public const PARAM_STR_ARRAY = Connection::PARAM_STR_ARRAY;
-
-
-	/**
-	 * Enable/disable automatic prefixing of table names with the oc_ prefix
-	 *
-	 * @param bool $enabled If set to true table names will be prefixed with the
-	 * owncloud database prefix automatically.
-	 * @since 8.2.0
-	 */
-	public function automaticTablePrefix($enabled);
-
-	/**
-	 * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->expr()->eq('u.id', 1));
-	 * </code>
-	 *
-	 * For more complex expression construction, consider storing the expression
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IExpressionBuilder
-	 * @since 8.2.0
-	 */
-	public function expr();
-
-	/**
-	 * Gets an FunctionBuilder used for object-oriented construction of query functions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->fun()->md5('u.id'));
-	 * </code>
-	 *
-	 * For more complex function construction, consider storing the function
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IFunctionBuilder
-	 * @since 12.0.0
-	 */
-	public function func();
-
-	/**
-	 * Gets the type of the currently built query.
-	 *
-	 * @return integer
-	 * @since 8.2.0
-	 */
-	public function getType();
-
-	/**
-	 * Gets the associated DBAL Connection for this query builder.
-	 *
-	 * @return \OCP\IDBConnection
-	 * @since 8.2.0
-	 */
-	public function getConnection();
-
-	/**
-	 * Gets the state of this query builder instance.
-	 *
-	 * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
-	 * @since 8.2.0
-	 */
-	public function getState();
-
-	/**
-	 * Executes this query using the bound parameters and their types.
-	 *
-	 * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeStatement}
-	 * for insert, update and delete statements.
-	 *
-	 * Warning: until Nextcloud 20, this method could return a \Doctrine\DBAL\Driver\Statement but since
-	 *          that interface changed in a breaking way the adapter \OCP\DB\QueryBuilder\IStatement is returned
-	 *          to bridge old code to the new API
-	 *
-	 * @return IResult|int
-	 * @throws Exception since 21.0.0
-	 * @since 8.2.0
-	 * @deprecated 22.0.0 Use executeQuery or executeUpdate
-	 */
-	public function execute();
-
-	/**
-	 * Execute for select statements
-	 *
-	 * @return IResult
-	 * @since 22.0.0
-	 *
-	 * @throws Exception
-	 * @throws \RuntimeException in case of usage with non select query
-	 */
-	public function executeQuery(): IResult;
-
-	/**
-	 * Execute insert, update and delete statements
-	 *
-	 * @return int the number of affected rows
-	 * @since 22.0.0
-	 *
-	 * @throws Exception
-	 * @throws \RuntimeException in case of usage with select query
-	 */
-	public function executeStatement(): int;
-
-	/**
-	 * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('User', 'u')
-	 *     echo $qb->getSQL(); // SELECT u FROM User u
-	 * </code>
-	 *
-	 * @return string The SQL query string.
-	 * @since 8.2.0
-	 */
-	public function getSQL();
-
-	/**
-	 * Sets a query parameter for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id')
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string|integer $key The parameter position or name.
-	 * @param mixed $value The parameter value.
-	 * @param string|null|int $type One of the IQueryBuilder::PARAM_* constants.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setParameter($key, $value, $type = null);
-
-	/**
-	 * Sets a collection of query parameters for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id1 OR u.id = :user_id2')
-	 *         ->setParameters(array(
-	 *             ':user_id1' => 1,
-	 *             ':user_id2' => 2
-	 *         ));
-	 * </code>
-	 *
-	 * @param array $params The query parameters to set.
-	 * @param array $types The query parameters types to set.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setParameters(array $params, array $types = []);
-
-	/**
-	 * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameters indexed by parameter index or name.
-	 * @since 8.2.0
-	 */
-	public function getParameters();
-
-	/**
-	 * Gets a (previously set) query parameter of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter.
-	 *
-	 * @return mixed The value of the bound parameter.
-	 * @since 8.2.0
-	 */
-	public function getParameter($key);
-
-	/**
-	 * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameter types indexed by parameter index or name.
-	 * @since 8.2.0
-	 */
-	public function getParameterTypes();
-
-	/**
-	 * Gets a (previously set) query parameter type of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter type.
-	 *
-	 * @return mixed The value of the bound parameter type.
-	 * @since 8.2.0
-	 */
-	public function getParameterType($key);
-
-	/**
-	 * Sets the position of the first result to retrieve (the "offset").
-	 *
-	 * @param integer $firstResult The first result to return.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setFirstResult($firstResult);
-
-	/**
-	 * Gets the position of the first result the query object was set to retrieve (the "offset").
-	 * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
-	 *
-	 * @return integer The position of the first result.
-	 * @since 8.2.0
-	 */
-	public function getFirstResult();
-
-	/**
-	 * Sets the maximum number of results to retrieve (the "limit").
-	 *
-	 * @param integer $maxResults The maximum number of results to retrieve.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setMaxResults($maxResults);
-
-	/**
-	 * Gets the maximum number of results the query object was set to retrieve (the "limit").
-	 * Returns NULL if {@link setMaxResults} was not applied to this query builder.
-	 *
-	 * @return int|null The maximum number of results.
-	 * @since 8.2.0
-	 */
-	public function getMaxResults();
-
-	/**
-	 * Specifies an item that is to be returned in the query result.
-	 * Replaces any previously specified selections, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id', 'p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed ...$selects The selection expressions.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $selects
-	 */
-	public function select(...$selects);
-
-	/**
-	 * Specifies an item that is to be returned with a different name in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectAlias('u.id', 'user_id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 * @param string $alias The column alias used in the constructed query.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.1
-	 *
-	 * @psalm-taint-sink sql $select
-	 * @psalm-taint-sink sql $alias
-	 */
-	public function selectAlias($select, $alias);
-
-	/**
-	 * Specifies an item that is to be returned uniquely in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectDistinct('type')
-	 *         ->from('users');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 9.0.0
-	 *
-	 * @psalm-taint-sink sql $select
-	 */
-	public function selectDistinct($select);
-
-	/**
-	 * Adds an item that is to be returned in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->addSelect('p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed ...$select The selection expression.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $select
-	 */
-	public function addSelect(...$select);
-
-	/**
-	 * Turns the query being built into a bulk delete query that ranges over
-	 * a certain table.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->delete('users', 'u')
-	 *         ->where('u.id = :user_id');
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string $delete The table whose rows are subject to the deletion.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $delete
-	 */
-	public function delete($delete = null, $alias = null);
-
-	/**
-	 * Turns the query being built into a bulk update query that ranges over
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $update The table whose rows are subject to the update.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $update
-	 */
-	public function update($update = null, $alias = null);
-
-	/**
-	 * Turns the query being built into an insert query that inserts into
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param string $insert The table into which the rows should be inserted.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $insert
-	 */
-	public function insert($insert = null);
-
-	/**
-	 * Creates and adds a query root corresponding to the table identified by the
-	 * given alias, forming a cartesian product with any existing query roots.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->from('users', 'u')
-	 * </code>
-	 *
-	 * @param string $from The table.
-	 * @param string|null $alias The alias of the table.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $from
-	 */
-	public function from($from, $alias = null);
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string|ICompositeExpression|null $condition The condition for the join.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $fromAlias
-	 * @psalm-taint-sink sql $join
-	 * @psalm-taint-sink sql $alias
-	 * @psalm-taint-sink sql $condition
-	 */
-	public function join($fromAlias, $join, $alias, $condition = null);
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string|ICompositeExpression|null $condition The condition for the join.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $fromAlias
-	 * @psalm-taint-sink sql $join
-	 * @psalm-taint-sink sql $alias
-	 * @psalm-taint-sink sql $condition
-	 */
-	public function innerJoin($fromAlias, $join, $alias, $condition = null);
-
-	/**
-	 * Creates and adds a left join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string|ICompositeExpression|null $condition The condition for the join.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $fromAlias
-	 * @psalm-taint-sink sql $join
-	 * @psalm-taint-sink sql $alias
-	 * @psalm-taint-sink sql $condition
-	 */
-	public function leftJoin($fromAlias, $join, $alias, $condition = null);
-
-	/**
-	 * Creates and adds a right join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string|ICompositeExpression|null $condition The condition for the join.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $fromAlias
-	 * @psalm-taint-sink sql $join
-	 * @psalm-taint-sink sql $alias
-	 * @psalm-taint-sink sql $condition
-	 */
-	public function rightJoin($fromAlias, $join, $alias, $condition = null);
-
-	/**
-	 * Sets a new value for a column in a bulk update query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $key The column to set.
-	 * @param ILiteral|IParameter|IQueryFunction|string $value The value, expression, placeholder, etc.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $key
-	 * @psalm-taint-sink sql $value
-	 */
-	public function set($key, $value);
-
-	/**
-	 * Specifies one or more restrictions to the query result.
-	 * Replaces any previously specified restrictions, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = ?');
-	 *
-	 *     // You can optionally programatically build and/or expressions
-	 *     $qb = $conn->getQueryBuilder();
-	 *
-	 *     $or = $qb->expr()->orx();
-	 *     $or->add($qb->expr()->eq('u.id', 1));
-	 *     $or->add($qb->expr()->eq('u.id', 2));
-	 *
-	 *     $qb->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where($or);
-	 * </code>
-	 *
-	 * @param mixed $predicates The restriction predicates.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $predicates
-	 */
-	public function where(...$predicates);
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * conjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.username LIKE ?')
-	 *         ->andWhere('u.is_active = 1');
-	 * </code>
-	 *
-	 * @param mixed ...$where The query restrictions.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 *
-	 * @see where()
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $where
-	 */
-	public function andWhere(...$where);
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * disjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = 1')
-	 *         ->orWhere('u.id = 2');
-	 * </code>
-	 *
-	 * @param mixed ...$where The WHERE statement.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 *
-	 * @see where()
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $where
-	 */
-	public function orWhere(...$where);
-
-	/**
-	 * Specifies a grouping over the results of the query.
-	 * Replaces any previously specified groupings, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.id');
-	 * </code>
-	 *
-	 * @param mixed ...$groupBys The grouping expression.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $groupBys
-	 */
-	public function groupBy(...$groupBys);
-
-	/**
-	 * Adds a grouping expression to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.lastLogin');
-	 *         ->addGroupBy('u.createdAt')
-	 * </code>
-	 *
-	 * @param mixed ...$groupBy The grouping expression.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $groupby
-	 */
-	public function addGroupBy(...$groupBy);
-
-	/**
-	 * Sets a value for a column in an insert query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?'
-	 *             )
-	 *         )
-	 *         ->setValue('password', '?');
-	 * </code>
-	 *
-	 * @param string $column The column into which the value should be inserted.
-	 * @param IParameter|string $value The value that should be inserted into the column.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $column
-	 * @psalm-taint-sink sql $value
-	 */
-	public function setValue($column, $value);
-
-	/**
-	 * Specifies values for an insert query indexed by column names.
-	 * Replaces any previous values, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param array $values The values to specify for the insert query indexed by column names.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $values
-	 */
-	public function values(array $values);
-
-	/**
-	 * Specifies a restriction over the groups of the query.
-	 * Replaces any previous having restrictions, if any.
-	 *
-	 * @param mixed ...$having The restriction over the groups.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $having
-	 */
-	public function having(...$having);
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * conjunction with any existing having restrictions.
-	 *
-	 * @param mixed ...$having The restriction to append.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $andHaving
-	 */
-	public function andHaving(...$having);
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * disjunction with any existing having restrictions.
-	 *
-	 * @param mixed ...$having The restriction to add.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $having
-	 */
-	public function orHaving(...$having);
-
-	/**
-	 * Specifies an ordering for the query results.
-	 * Replaces any previously specified orderings, if any.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $sort
-	 * @psalm-taint-sink sql $order
-	 */
-	public function orderBy($sort, $order = null);
-
-	/**
-	 * Adds an ordering to the query results.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql $sort
-	 * @psalm-taint-sink sql $order
-	 */
-	public function addOrderBy($sort, $order = null);
-
-	/**
-	 * Gets a query part by its name.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return mixed
-	 * @since 8.2.0
-	 */
-	public function getQueryPart($queryPartName);
-
-	/**
-	 * Gets all query parts.
-	 *
-	 * @return array
-	 * @since 8.2.0
-	 */
-	public function getQueryParts();
-
-	/**
-	 * Resets SQL parts.
-	 *
-	 * @param array|null $queryPartNames
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function resetQueryParts($queryPartNames = null);
-
-	/**
-	 * Resets a single SQL part.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return $this This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function resetQueryPart($queryPartName);
-
-	/**
-	 * Creates a new named parameter and bind the value $value to it.
-	 *
-	 * This method provides a shortcut for PDOStatement::bindValue
-	 * when using prepared statements.
-	 *
-	 * The parameter $value specifies the value that you want to bind. If
-	 * $placeholder is not provided bindValue() will automatically create a
-	 * placeholder for you. An automatic placeholder will be of the name
-	 * ':dcValue1', ':dcValue2' etc.
-	 *
-	 * For more information see {@link https://www.php.net/pdostatement-bindparam}
-	 *
-	 * Example:
-	 * <code>
-	 * $value = 2;
-	 * $q->eq( 'id', $q->bindValue( $value ) );
-	 * $stmt = $q->executeQuery(); // executed with 'id = 2'
-	 * </code>
-	 *
-	 * @license New BSD License
-	 * @link http://www.zetacomponents.org
-	 *
-	 * @param mixed $value
-	 * @param mixed $type
-	 * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
-	 *
-	 * @return IParameter
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-escape sql
-	 */
-	public function createNamedParameter($value, $type = self::PARAM_STR, $placeHolder = null);
-
-	/**
-	 * Creates a new positional parameter and bind the given value to it.
-	 *
-	 * Attention: If you are using positional parameters with the query builder you have
-	 * to be very careful to bind all parameters in the order they appear in the SQL
-	 * statement , otherwise they get bound in the wrong order which can lead to serious
-	 * bugs in your code.
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
-	 *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param mixed $value
-	 * @param integer $type
-	 *
-	 * @return IParameter
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-escape sql
-	 */
-	public function createPositionalParameter($value, $type = self::PARAM_STR);
-
-	/**
-	 * Creates a new parameter
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createParameter('name'))
-	 *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param string $name
-	 *
-	 * @return IParameter
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-escape sql
-	 */
-	public function createParameter($name);
-
-	/**
-	 * Creates a new function
-	 *
-	 * Attention: Column names inside the call have to be quoted before hand
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(*)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
-	 * </code>
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(`column`)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
-	 * </code>
-	 *
-	 * @param string $call
-	 *
-	 * @return IQueryFunction
-	 * @since 8.2.0
-	 *
-	 * @psalm-taint-sink sql
-	 */
-	public function createFunction($call);
-
-	/**
-	 * Used to get the id of the last inserted element
-	 * @return int
-	 * @throws \BadMethodCallException When being called before an insert query has been run.
-	 * @since 9.0.0
-	 */
-	public function getLastInsertId(): int;
-
-	/**
-	 * Returns the table name quoted and with database prefix as needed by the implementation
-	 *
-	 * @param string $table
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getTableName($table);
-
-	/**
-	 * Returns the column name quoted and with table alias prefix as needed by the implementation
-	 *
-	 * @param string $column
-	 * @param string $tableAlias
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getColumnName($column, $tableAlias = '');
+    /**
+     * @since 9.0.0
+     */
+    public const PARAM_NULL = \PDO::PARAM_NULL;
+    /**
+     * @since 9.0.0
+     */
+    public const PARAM_BOOL = \PDO::PARAM_BOOL;
+    /**
+     * @since 9.0.0
+     */
+    public const PARAM_INT = \PDO::PARAM_INT;
+    /**
+     * @since 9.0.0
+     */
+    public const PARAM_STR = \PDO::PARAM_STR;
+    /**
+     * @since 9.0.0
+     */
+    public const PARAM_LOB = \PDO::PARAM_LOB;
+    /**
+     * @since 9.0.0
+     */
+    public const PARAM_DATE = 'datetime';
+
+    /**
+     * @since 9.0.0
+     */
+    public const PARAM_INT_ARRAY = Connection::PARAM_INT_ARRAY;
+    /**
+     * @since 9.0.0
+     */
+    public const PARAM_STR_ARRAY = Connection::PARAM_STR_ARRAY;
+
+
+    /**
+     * Enable/disable automatic prefixing of table names with the oc_ prefix
+     *
+     * @param bool $enabled If set to true table names will be prefixed with the
+     * owncloud database prefix automatically.
+     * @since 8.2.0
+     */
+    public function automaticTablePrefix($enabled);
+
+    /**
+     * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->expr()->eq('u.id', 1));
+     * </code>
+     *
+     * For more complex expression construction, consider storing the expression
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IExpressionBuilder
+     * @since 8.2.0
+     */
+    public function expr();
+
+    /**
+     * Gets an FunctionBuilder used for object-oriented construction of query functions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->fun()->md5('u.id'));
+     * </code>
+     *
+     * For more complex function construction, consider storing the function
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IFunctionBuilder
+     * @since 12.0.0
+     */
+    public function func();
+
+    /**
+     * Gets the type of the currently built query.
+     *
+     * @return integer
+     * @since 8.2.0
+     */
+    public function getType();
+
+    /**
+     * Gets the associated DBAL Connection for this query builder.
+     *
+     * @return \OCP\IDBConnection
+     * @since 8.2.0
+     */
+    public function getConnection();
+
+    /**
+     * Gets the state of this query builder instance.
+     *
+     * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
+     * @since 8.2.0
+     */
+    public function getState();
+
+    /**
+     * Executes this query using the bound parameters and their types.
+     *
+     * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeStatement}
+     * for insert, update and delete statements.
+     *
+     * Warning: until Nextcloud 20, this method could return a \Doctrine\DBAL\Driver\Statement but since
+     *          that interface changed in a breaking way the adapter \OCP\DB\QueryBuilder\IStatement is returned
+     *          to bridge old code to the new API
+     *
+     * @return IResult|int
+     * @throws Exception since 21.0.0
+     * @since 8.2.0
+     * @deprecated 22.0.0 Use executeQuery or executeUpdate
+     */
+    public function execute();
+
+    /**
+     * Execute for select statements
+     *
+     * @return IResult
+     * @since 22.0.0
+     *
+     * @throws Exception
+     * @throws \RuntimeException in case of usage with non select query
+     */
+    public function executeQuery(): IResult;
+
+    /**
+     * Execute insert, update and delete statements
+     *
+     * @return int the number of affected rows
+     * @since 22.0.0
+     *
+     * @throws Exception
+     * @throws \RuntimeException in case of usage with select query
+     */
+    public function executeStatement(): int;
+
+    /**
+     * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('User', 'u')
+     *     echo $qb->getSQL(); // SELECT u FROM User u
+     * </code>
+     *
+     * @return string The SQL query string.
+     * @since 8.2.0
+     */
+    public function getSQL();
+
+    /**
+     * Sets a query parameter for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id')
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string|integer $key The parameter position or name.
+     * @param mixed $value The parameter value.
+     * @param string|null|int $type One of the IQueryBuilder::PARAM_* constants.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setParameter($key, $value, $type = null);
+
+    /**
+     * Sets a collection of query parameters for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id1 OR u.id = :user_id2')
+     *         ->setParameters(array(
+     *             ':user_id1' => 1,
+     *             ':user_id2' => 2
+     *         ));
+     * </code>
+     *
+     * @param array $params The query parameters to set.
+     * @param array $types The query parameters types to set.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setParameters(array $params, array $types = []);
+
+    /**
+     * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameters indexed by parameter index or name.
+     * @since 8.2.0
+     */
+    public function getParameters();
+
+    /**
+     * Gets a (previously set) query parameter of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter.
+     *
+     * @return mixed The value of the bound parameter.
+     * @since 8.2.0
+     */
+    public function getParameter($key);
+
+    /**
+     * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameter types indexed by parameter index or name.
+     * @since 8.2.0
+     */
+    public function getParameterTypes();
+
+    /**
+     * Gets a (previously set) query parameter type of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter type.
+     *
+     * @return mixed The value of the bound parameter type.
+     * @since 8.2.0
+     */
+    public function getParameterType($key);
+
+    /**
+     * Sets the position of the first result to retrieve (the "offset").
+     *
+     * @param integer $firstResult The first result to return.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setFirstResult($firstResult);
+
+    /**
+     * Gets the position of the first result the query object was set to retrieve (the "offset").
+     * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
+     *
+     * @return integer The position of the first result.
+     * @since 8.2.0
+     */
+    public function getFirstResult();
+
+    /**
+     * Sets the maximum number of results to retrieve (the "limit").
+     *
+     * @param integer $maxResults The maximum number of results to retrieve.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setMaxResults($maxResults);
+
+    /**
+     * Gets the maximum number of results the query object was set to retrieve (the "limit").
+     * Returns NULL if {@link setMaxResults} was not applied to this query builder.
+     *
+     * @return int|null The maximum number of results.
+     * @since 8.2.0
+     */
+    public function getMaxResults();
+
+    /**
+     * Specifies an item that is to be returned in the query result.
+     * Replaces any previously specified selections, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id', 'p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed ...$selects The selection expressions.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $selects
+     */
+    public function select(...$selects);
+
+    /**
+     * Specifies an item that is to be returned with a different name in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectAlias('u.id', 'user_id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     * @param string $alias The column alias used in the constructed query.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.1
+     *
+     * @psalm-taint-sink sql $select
+     * @psalm-taint-sink sql $alias
+     */
+    public function selectAlias($select, $alias);
+
+    /**
+     * Specifies an item that is to be returned uniquely in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectDistinct('type')
+     *         ->from('users');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 9.0.0
+     *
+     * @psalm-taint-sink sql $select
+     */
+    public function selectDistinct($select);
+
+    /**
+     * Adds an item that is to be returned in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->addSelect('p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed ...$select The selection expression.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $select
+     */
+    public function addSelect(...$select);
+
+    /**
+     * Turns the query being built into a bulk delete query that ranges over
+     * a certain table.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->delete('users', 'u')
+     *         ->where('u.id = :user_id');
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string $delete The table whose rows are subject to the deletion.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $delete
+     */
+    public function delete($delete = null, $alias = null);
+
+    /**
+     * Turns the query being built into a bulk update query that ranges over
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $update The table whose rows are subject to the update.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $update
+     */
+    public function update($update = null, $alias = null);
+
+    /**
+     * Turns the query being built into an insert query that inserts into
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param string $insert The table into which the rows should be inserted.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $insert
+     */
+    public function insert($insert = null);
+
+    /**
+     * Creates and adds a query root corresponding to the table identified by the
+     * given alias, forming a cartesian product with any existing query roots.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->from('users', 'u')
+     * </code>
+     *
+     * @param string $from The table.
+     * @param string|null $alias The alias of the table.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $from
+     */
+    public function from($from, $alias = null);
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string|ICompositeExpression|null $condition The condition for the join.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $fromAlias
+     * @psalm-taint-sink sql $join
+     * @psalm-taint-sink sql $alias
+     * @psalm-taint-sink sql $condition
+     */
+    public function join($fromAlias, $join, $alias, $condition = null);
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string|ICompositeExpression|null $condition The condition for the join.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $fromAlias
+     * @psalm-taint-sink sql $join
+     * @psalm-taint-sink sql $alias
+     * @psalm-taint-sink sql $condition
+     */
+    public function innerJoin($fromAlias, $join, $alias, $condition = null);
+
+    /**
+     * Creates and adds a left join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string|ICompositeExpression|null $condition The condition for the join.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $fromAlias
+     * @psalm-taint-sink sql $join
+     * @psalm-taint-sink sql $alias
+     * @psalm-taint-sink sql $condition
+     */
+    public function leftJoin($fromAlias, $join, $alias, $condition = null);
+
+    /**
+     * Creates and adds a right join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string|ICompositeExpression|null $condition The condition for the join.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $fromAlias
+     * @psalm-taint-sink sql $join
+     * @psalm-taint-sink sql $alias
+     * @psalm-taint-sink sql $condition
+     */
+    public function rightJoin($fromAlias, $join, $alias, $condition = null);
+
+    /**
+     * Sets a new value for a column in a bulk update query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $key The column to set.
+     * @param ILiteral|IParameter|IQueryFunction|string $value The value, expression, placeholder, etc.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $key
+     * @psalm-taint-sink sql $value
+     */
+    public function set($key, $value);
+
+    /**
+     * Specifies one or more restrictions to the query result.
+     * Replaces any previously specified restrictions, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = ?');
+     *
+     *     // You can optionally programatically build and/or expressions
+     *     $qb = $conn->getQueryBuilder();
+     *
+     *     $or = $qb->expr()->orx();
+     *     $or->add($qb->expr()->eq('u.id', 1));
+     *     $or->add($qb->expr()->eq('u.id', 2));
+     *
+     *     $qb->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where($or);
+     * </code>
+     *
+     * @param mixed $predicates The restriction predicates.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $predicates
+     */
+    public function where(...$predicates);
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * conjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.username LIKE ?')
+     *         ->andWhere('u.is_active = 1');
+     * </code>
+     *
+     * @param mixed ...$where The query restrictions.
+     *
+     * @return $this This QueryBuilder instance.
+     *
+     * @see where()
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $where
+     */
+    public function andWhere(...$where);
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * disjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = 1')
+     *         ->orWhere('u.id = 2');
+     * </code>
+     *
+     * @param mixed ...$where The WHERE statement.
+     *
+     * @return $this This QueryBuilder instance.
+     *
+     * @see where()
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $where
+     */
+    public function orWhere(...$where);
+
+    /**
+     * Specifies a grouping over the results of the query.
+     * Replaces any previously specified groupings, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.id');
+     * </code>
+     *
+     * @param mixed ...$groupBys The grouping expression.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $groupBys
+     */
+    public function groupBy(...$groupBys);
+
+    /**
+     * Adds a grouping expression to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.lastLogin');
+     *         ->addGroupBy('u.createdAt')
+     * </code>
+     *
+     * @param mixed ...$groupBy The grouping expression.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $groupby
+     */
+    public function addGroupBy(...$groupBy);
+
+    /**
+     * Sets a value for a column in an insert query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?'
+     *             )
+     *         )
+     *         ->setValue('password', '?');
+     * </code>
+     *
+     * @param string $column The column into which the value should be inserted.
+     * @param IParameter|string $value The value that should be inserted into the column.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $column
+     * @psalm-taint-sink sql $value
+     */
+    public function setValue($column, $value);
+
+    /**
+     * Specifies values for an insert query indexed by column names.
+     * Replaces any previous values, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param array $values The values to specify for the insert query indexed by column names.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $values
+     */
+    public function values(array $values);
+
+    /**
+     * Specifies a restriction over the groups of the query.
+     * Replaces any previous having restrictions, if any.
+     *
+     * @param mixed ...$having The restriction over the groups.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $having
+     */
+    public function having(...$having);
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * conjunction with any existing having restrictions.
+     *
+     * @param mixed ...$having The restriction to append.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $andHaving
+     */
+    public function andHaving(...$having);
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * disjunction with any existing having restrictions.
+     *
+     * @param mixed ...$having The restriction to add.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $having
+     */
+    public function orHaving(...$having);
+
+    /**
+     * Specifies an ordering for the query results.
+     * Replaces any previously specified orderings, if any.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $sort
+     * @psalm-taint-sink sql $order
+     */
+    public function orderBy($sort, $order = null);
+
+    /**
+     * Adds an ordering to the query results.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql $sort
+     * @psalm-taint-sink sql $order
+     */
+    public function addOrderBy($sort, $order = null);
+
+    /**
+     * Gets a query part by its name.
+     *
+     * @param string $queryPartName
+     *
+     * @return mixed
+     * @since 8.2.0
+     */
+    public function getQueryPart($queryPartName);
+
+    /**
+     * Gets all query parts.
+     *
+     * @return array
+     * @since 8.2.0
+     */
+    public function getQueryParts();
+
+    /**
+     * Resets SQL parts.
+     *
+     * @param array|null $queryPartNames
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function resetQueryParts($queryPartNames = null);
+
+    /**
+     * Resets a single SQL part.
+     *
+     * @param string $queryPartName
+     *
+     * @return $this This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function resetQueryPart($queryPartName);
+
+    /**
+     * Creates a new named parameter and bind the value $value to it.
+     *
+     * This method provides a shortcut for PDOStatement::bindValue
+     * when using prepared statements.
+     *
+     * The parameter $value specifies the value that you want to bind. If
+     * $placeholder is not provided bindValue() will automatically create a
+     * placeholder for you. An automatic placeholder will be of the name
+     * ':dcValue1', ':dcValue2' etc.
+     *
+     * For more information see {@link https://www.php.net/pdostatement-bindparam}
+     *
+     * Example:
+     * <code>
+     * $value = 2;
+     * $q->eq( 'id', $q->bindValue( $value ) );
+     * $stmt = $q->executeQuery(); // executed with 'id = 2'
+     * </code>
+     *
+     * @license New BSD License
+     * @link http://www.zetacomponents.org
+     *
+     * @param mixed $value
+     * @param mixed $type
+     * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
+     *
+     * @return IParameter
+     * @since 8.2.0
+     *
+     * @psalm-taint-escape sql
+     */
+    public function createNamedParameter($value, $type = self::PARAM_STR, $placeHolder = null);
+
+    /**
+     * Creates a new positional parameter and bind the given value to it.
+     *
+     * Attention: If you are using positional parameters with the query builder you have
+     * to be very careful to bind all parameters in the order they appear in the SQL
+     * statement , otherwise they get bound in the wrong order which can lead to serious
+     * bugs in your code.
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
+     *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param mixed $value
+     * @param integer $type
+     *
+     * @return IParameter
+     * @since 8.2.0
+     *
+     * @psalm-taint-escape sql
+     */
+    public function createPositionalParameter($value, $type = self::PARAM_STR);
+
+    /**
+     * Creates a new parameter
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createParameter('name'))
+     *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param string $name
+     *
+     * @return IParameter
+     * @since 8.2.0
+     *
+     * @psalm-taint-escape sql
+     */
+    public function createParameter($name);
+
+    /**
+     * Creates a new function
+     *
+     * Attention: Column names inside the call have to be quoted before hand
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(*)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
+     * </code>
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(`column`)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
+     * </code>
+     *
+     * @param string $call
+     *
+     * @return IQueryFunction
+     * @since 8.2.0
+     *
+     * @psalm-taint-sink sql
+     */
+    public function createFunction($call);
+
+    /**
+     * Used to get the id of the last inserted element
+     * @return int
+     * @throws \BadMethodCallException When being called before an insert query has been run.
+     * @since 9.0.0
+     */
+    public function getLastInsertId(): int;
+
+    /**
+     * Returns the table name quoted and with database prefix as needed by the implementation
+     *
+     * @param string $table
+     * @return string
+     * @since 9.0.0
+     */
+    public function getTableName($table);
+
+    /**
+     * Returns the column name quoted and with table alias prefix as needed by the implementation
+     *
+     * @param string $column
+     * @param string $tableAlias
+     * @return string
+     * @since 9.0.0
+     */
+    public function getColumnName($column, $tableAlias = '');
 }

lib/private/DB/QueryBuilder/QueryBuilder.php

Indentation +1296 added lines, -1296 removed lines

@@ -57,1300 +57,1300 @@
 
 class QueryBuilder implements IQueryBuilder {
 
-	/** @var ConnectionAdapter */
-	private $connection;
-
-	/** @var SystemConfig */
-	private $systemConfig;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var \Doctrine\DBAL\Query\QueryBuilder */
-	private $queryBuilder;
-
-	/** @var QuoteHelper */
-	private $helper;
-
-	/** @var bool */
-	private $automaticTablePrefix = true;
-
-	/** @var string */
-	protected $lastInsertedTable;
-
-	/**
-	 * Initializes a new QueryBuilder.
-	 *
-	 * @param ConnectionAdapter $connection
-	 * @param SystemConfig $systemConfig
-	 * @param ILogger $logger
-	 */
-	public function __construct(ConnectionAdapter $connection, SystemConfig $systemConfig, ILogger $logger) {
-		$this->connection = $connection;
-		$this->systemConfig = $systemConfig;
-		$this->logger = $logger;
-		$this->queryBuilder = new \Doctrine\DBAL\Query\QueryBuilder($this->connection->getInner());
-		$this->helper = new QuoteHelper();
-	}
-
-	/**
-	 * Enable/disable automatic prefixing of table names with the oc_ prefix
-	 *
-	 * @param bool $enabled If set to true table names will be prefixed with the
-	 * owncloud database prefix automatically.
-	 * @since 8.2.0
-	 */
-	public function automaticTablePrefix($enabled) {
-		$this->automaticTablePrefix = (bool) $enabled;
-	}
-
-	/**
-	 * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->expr()->eq('u.id', 1));
-	 * </code>
-	 *
-	 * For more complex expression construction, consider storing the expression
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IExpressionBuilder
-	 */
-	public function expr() {
-		if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
-			return new OCIExpressionBuilder($this->connection, $this);
-		}
-		if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) {
-			return new PgSqlExpressionBuilder($this->connection, $this);
-		}
-		if ($this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-			return new MySqlExpressionBuilder($this->connection, $this);
-		}
-		if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return new SqliteExpressionBuilder($this->connection, $this);
-		}
-
-		return new ExpressionBuilder($this->connection, $this);
-	}
-
-	/**
-	 * Gets an FunctionBuilder used for object-oriented construction of query functions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->fun()->md5('u.id'));
-	 * </code>
-	 *
-	 * For more complex function construction, consider storing the function
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IFunctionBuilder
-	 */
-	public function func() {
-		if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
-			return new OCIFunctionBuilder($this->helper);
-		}
-		if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return new SqliteFunctionBuilder($this->helper);
-		}
-		if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) {
-			return new PgSqlFunctionBuilder($this->helper);
-		}
-
-		return new FunctionBuilder($this->helper);
-	}
-
-	/**
-	 * Gets the type of the currently built query.
-	 *
-	 * @return integer
-	 */
-	public function getType() {
-		return $this->queryBuilder->getType();
-	}
-
-	/**
-	 * Gets the associated DBAL Connection for this query builder.
-	 *
-	 * @return \OCP\IDBConnection
-	 */
-	public function getConnection() {
-		return $this->connection;
-	}
-
-	/**
-	 * Gets the state of this query builder instance.
-	 *
-	 * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
-	 */
-	public function getState() {
-		return $this->queryBuilder->getState();
-	}
-
-	/**
-	 * Executes this query using the bound parameters and their types.
-	 *
-	 * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate}
-	 * for insert, update and delete statements.
-	 *
-	 * @return IResult|int
-	 */
-	public function execute() {
-		if ($this->systemConfig->getValue('log_query', false)) {
-			try {
-				$params = [];
-				foreach ($this->getParameters() as $placeholder => $value) {
-					if ($value instanceof \DateTime) {
-						$params[] = $placeholder . ' => DateTime:\'' . $value->format('c') . '\'';
-					} elseif (is_array($value)) {
-						$params[] = $placeholder . ' => (\'' . implode('\', \'', $value) . '\')';
-					} else {
-						$params[] = $placeholder . ' => \'' . $value . '\'';
-					}
-				}
-				if (empty($params)) {
-					$this->logger->debug('DB QueryBuilder: \'{query}\'', [
-						'query' => $this->getSQL(),
-						'app' => 'core',
-					]);
-				} else {
-					$this->logger->debug('DB QueryBuilder: \'{query}\' with parameters: {params}', [
-						'query' => $this->getSQL(),
-						'params' => implode(', ', $params),
-						'app' => 'core',
-					]);
-				}
-			} catch (\Error $e) {
-				// likely an error during conversion of $value to string
-				$this->logger->debug('DB QueryBuilder: error trying to log SQL query');
-				$this->logger->logException($e);
-			}
-		}
-
-		if (!empty($this->getQueryPart('select'))) {
-			$select = $this->getQueryPart('select');
-			$hasSelectAll = array_filter($select, static function ($s) {
-				return $s === '*';
-			});
-			$hasSelectSpecific = array_filter($select, static function ($s) {
-				return $s !== '*';
-			});
-
-			if (empty($hasSelectAll) === empty($hasSelectSpecific)) {
-				$exception = new QueryException('Query is selecting * and specific values in the same query. This is not supported in Oracle.');
-				$this->logger->logException($exception, [
-					'message' => 'Query is selecting * and specific values in the same query. This is not supported in Oracle.',
-					'query' => $this->getSQL(),
-					'level' => ILogger::ERROR,
-					'app' => 'core',
-				]);
-			}
-		}
-
-		$numberOfParameters = 0;
-		$hasTooLargeArrayParameter = false;
-		foreach ($this->getParameters() as $parameter) {
-			if (is_array($parameter)) {
-				$count = count($parameter);
-				$numberOfParameters += $count;
-				$hasTooLargeArrayParameter = $hasTooLargeArrayParameter || ($count > 1000);
-			}
-		}
-
-		if ($hasTooLargeArrayParameter) {
-			$exception = new QueryException('More than 1000 expressions in a list are not allowed on Oracle.');
-			$this->logger->logException($exception, [
-				'message' => 'More than 1000 expressions in a list are not allowed on Oracle.',
-				'query' => $this->getSQL(),
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-		}
-
-		if ($numberOfParameters > 65535) {
-			$exception = new QueryException('The number of parameters must not exceed 65535. Restriction by PostgreSQL.');
-			$this->logger->logException($exception, [
-				'message' => 'The number of parameters must not exceed 65535. Restriction by PostgreSQL.',
-				'query' => $this->getSQL(),
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-		}
-
-		$result = $this->queryBuilder->execute();
-		if (is_int($result)) {
-			return $result;
-		}
-		return new ResultAdapter($result);
-	}
-
-	public function executeQuery(): IResult {
-		if ($this->getType() !== \Doctrine\DBAL\Query\QueryBuilder::SELECT) {
-			throw new \RuntimeException('Invalid query type, expected SELECT query');
-		}
-
-		try {
-			$result = $this->execute();
-		} catch (\Doctrine\DBAL\Exception $e) {
-			throw \OC\DB\Exceptions\DbalException::wrap($e);
-		}
-
-		if ($result instanceof IResult) {
-			return $result;
-		}
-
-		throw new \RuntimeException('Invalid return type for query');
-	}
-
-	/**
-	 * Monkey-patched compatibility layer for apps that were adapted for Nextcloud 22 before
-	 * the first beta, where executeStatement was named executeUpdate.
-	 *
-	 * Static analysis should catch those misuses, but until then let's try to keep things
-	 * running.
-	 *
-	 * @internal
-	 * @deprecated
-	 * @todo drop ASAP
-	 */
-	public function executeUpdate(): int {
-		return $this->executeStatement();
-	}
-
-	public function executeStatement(): int {
-		if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::SELECT) {
-			throw new \RuntimeException('Invalid query type, expected INSERT, DELETE or UPDATE statement');
-		}
-
-		try {
-			$result = $this->execute();
-		} catch (\Doctrine\DBAL\Exception $e) {
-			throw \OC\DB\Exceptions\DbalException::wrap($e);
-		}
-
-		if (!is_int($result)) {
-			throw new \RuntimeException('Invalid return type for statement');
-		}
-
-		return $result;
-	}
-
-
-	/**
-	 * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('User', 'u')
-	 *     echo $qb->getSQL(); // SELECT u FROM User u
-	 * </code>
-	 *
-	 * @return string The SQL query string.
-	 */
-	public function getSQL() {
-		return $this->queryBuilder->getSQL();
-	}
-
-	/**
-	 * Sets a query parameter for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id')
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string|integer $key The parameter position or name.
-	 * @param mixed $value The parameter value.
-	 * @param string|null|int $type One of the IQueryBuilder::PARAM_* constants.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function setParameter($key, $value, $type = null) {
-		$this->queryBuilder->setParameter($key, $value, $type);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a collection of query parameters for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id1 OR u.id = :user_id2')
-	 *         ->setParameters(array(
-	 *             ':user_id1' => 1,
-	 *             ':user_id2' => 2
-	 *         ));
-	 * </code>
-	 *
-	 * @param array $params The query parameters to set.
-	 * @param array $types The query parameters types to set.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function setParameters(array $params, array $types = []) {
-		$this->queryBuilder->setParameters($params, $types);
-
-		return $this;
-	}
-
-	/**
-	 * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameters indexed by parameter index or name.
-	 */
-	public function getParameters() {
-		return $this->queryBuilder->getParameters();
-	}
-
-	/**
-	 * Gets a (previously set) query parameter of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter.
-	 *
-	 * @return mixed The value of the bound parameter.
-	 */
-	public function getParameter($key) {
-		return $this->queryBuilder->getParameter($key);
-	}
-
-	/**
-	 * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameter types indexed by parameter index or name.
-	 */
-	public function getParameterTypes() {
-		return $this->queryBuilder->getParameterTypes();
-	}
-
-	/**
-	 * Gets a (previously set) query parameter type of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter type.
-	 *
-	 * @return mixed The value of the bound parameter type.
-	 */
-	public function getParameterType($key) {
-		return $this->queryBuilder->getParameterType($key);
-	}
-
-	/**
-	 * Sets the position of the first result to retrieve (the "offset").
-	 *
-	 * @param integer $firstResult The first result to return.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function setFirstResult($firstResult) {
-		$this->queryBuilder->setFirstResult($firstResult);
-
-		return $this;
-	}
-
-	/**
-	 * Gets the position of the first result the query object was set to retrieve (the "offset").
-	 * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
-	 *
-	 * @return integer The position of the first result.
-	 */
-	public function getFirstResult() {
-		return $this->queryBuilder->getFirstResult();
-	}
-
-	/**
-	 * Sets the maximum number of results to retrieve (the "limit").
-	 *
-	 * NOTE: Setting max results to "0" will cause mixed behaviour. While most
-	 * of the databases will just return an empty result set, Oracle will return
-	 * all entries.
-	 *
-	 * @param integer $maxResults The maximum number of results to retrieve.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function setMaxResults($maxResults) {
-		$this->queryBuilder->setMaxResults($maxResults);
-
-		return $this;
-	}
-
-	/**
-	 * Gets the maximum number of results the query object was set to retrieve (the "limit").
-	 * Returns NULL if {@link setMaxResults} was not applied to this query builder.
-	 *
-	 * @return int|null The maximum number of results.
-	 */
-	public function getMaxResults() {
-		return $this->queryBuilder->getMaxResults();
-	}
-
-	/**
-	 * Specifies an item that is to be returned in the query result.
-	 * Replaces any previously specified selections, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id', 'p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed ...$selects The selection expressions.
-	 *
-	 * '@return $this This QueryBuilder instance.
-	 */
-	public function select(...$selects) {
-		if (count($selects) === 1 && is_array($selects[0])) {
-			$selects = $selects[0];
-		}
-
-		$this->queryBuilder->select(
-			$this->helper->quoteColumnNames($selects)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an item that is to be returned with a different name in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectAlias('u.id', 'user_id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 * @param string $alias The column alias used in the constructed query.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function selectAlias($select, $alias) {
-		$this->queryBuilder->addSelect(
-			$this->helper->quoteColumnName($select) . ' AS ' . $this->helper->quoteColumnName($alias)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an item that is to be returned uniquely in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectDistinct('type')
-	 *         ->from('users');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function selectDistinct($select) {
-		if (!is_array($select)) {
-			$select = [$select];
-		}
-
-		$quotedSelect = $this->helper->quoteColumnNames($select);
-
-		$this->queryBuilder->addSelect(
-			'DISTINCT ' . implode(', ', $quotedSelect)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds an item that is to be returned in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->addSelect('p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed ...$selects The selection expression.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function addSelect(...$selects) {
-		if (count($selects) === 1 && is_array($selects[0])) {
-			$selects = $selects[0];
-		}
-
-		$this->queryBuilder->addSelect(
-			$this->helper->quoteColumnNames($selects)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into a bulk delete query that ranges over
-	 * a certain table.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->delete('users', 'u')
-	 *         ->where('u.id = :user_id');
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string $delete The table whose rows are subject to the deletion.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function delete($delete = null, $alias = null) {
-		$this->queryBuilder->delete(
-			$this->getTableName($delete),
-			$alias
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into a bulk update query that ranges over
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $update The table whose rows are subject to the update.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function update($update = null, $alias = null) {
-		$this->queryBuilder->update(
-			$this->getTableName($update),
-			$alias
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into an insert query that inserts into
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param string $insert The table into which the rows should be inserted.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function insert($insert = null) {
-		$this->queryBuilder->insert(
-			$this->getTableName($insert)
-		);
-
-		$this->lastInsertedTable = $insert;
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a query root corresponding to the table identified by the
-	 * given alias, forming a cartesian product with any existing query roots.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->from('users', 'u')
-	 * </code>
-	 *
-	 * @param string $from The table.
-	 * @param string|null $alias The alias of the table.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function from($from, $alias = null) {
-		$this->queryBuilder->from(
-			$this->getTableName($from),
-			$this->quoteAlias($alias)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string|ICompositeExpression|null $condition The condition for the join.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function join($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->join(
-			$this->quoteAlias($fromAlias),
-			$this->getTableName($join),
-			$this->quoteAlias($alias),
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string|ICompositeExpression|null $condition The condition for the join.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function innerJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->innerJoin(
-			$this->quoteAlias($fromAlias),
-			$this->getTableName($join),
-			$this->quoteAlias($alias),
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a left join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string|ICompositeExpression|null $condition The condition for the join.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function leftJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->leftJoin(
-			$this->quoteAlias($fromAlias),
-			$this->getTableName($join),
-			$this->quoteAlias($alias),
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a right join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string|ICompositeExpression|null $condition The condition for the join.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function rightJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->rightJoin(
-			$this->quoteAlias($fromAlias),
-			$this->getTableName($join),
-			$this->quoteAlias($alias),
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a new value for a column in a bulk update query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $key The column to set.
-	 * @param ILiteral|IParameter|IQueryFunction|string $value The value, expression, placeholder, etc.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function set($key, $value) {
-		$this->queryBuilder->set(
-			$this->helper->quoteColumnName($key),
-			$this->helper->quoteColumnName($value)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies one or more restrictions to the query result.
-	 * Replaces any previously specified restrictions, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = ?');
-	 *
-	 *     // You can optionally programatically build and/or expressions
-	 *     $qb = $conn->getQueryBuilder();
-	 *
-	 *     $or = $qb->expr()->orx();
-	 *     $or->add($qb->expr()->eq('u.id', 1));
-	 *     $or->add($qb->expr()->eq('u.id', 2));
-	 *
-	 *     $qb->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where($or);
-	 * </code>
-	 *
-	 * @param mixed ...$predicates The restriction predicates.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function where(...$predicates) {
-		call_user_func_array(
-			[$this->queryBuilder, 'where'],
-			$predicates
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * conjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.username LIKE ?')
-	 *         ->andWhere('u.is_active = 1');
-	 * </code>
-	 *
-	 * @param mixed ...$where The query restrictions.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 *
-	 * @see where()
-	 */
-	public function andWhere(...$where) {
-		call_user_func_array(
-			[$this->queryBuilder, 'andWhere'],
-			$where
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * disjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = 1')
-	 *         ->orWhere('u.id = 2');
-	 * </code>
-	 *
-	 * @param mixed ...$where The WHERE statement.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 *
-	 * @see where()
-	 */
-	public function orWhere(...$where) {
-		call_user_func_array(
-			[$this->queryBuilder, 'orWhere'],
-			$where
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies a grouping over the results of the query.
-	 * Replaces any previously specified groupings, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.id');
-	 * </code>
-	 *
-	 * @param mixed ...$groupBys The grouping expression.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function groupBy(...$groupBys) {
-		if (count($groupBys) === 1 && is_array($groupBys[0])) {
-			$groupBys = $groupBys[0];
-		}
-
-		call_user_func_array(
-			[$this->queryBuilder, 'groupBy'],
-			$this->helper->quoteColumnNames($groupBys)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a grouping expression to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.lastLogin');
-	 *         ->addGroupBy('u.createdAt')
-	 * </code>
-	 *
-	 * @param mixed ...$groupBy The grouping expression.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function addGroupBy(...$groupBys) {
-		if (count($groupBys) === 1 && is_array($groupBys[0])) {
-			$$groupBys = $groupBys[0];
-		}
-
-		call_user_func_array(
-			[$this->queryBuilder, 'addGroupBy'],
-			$this->helper->quoteColumnNames($groupBys)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a value for a column in an insert query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?'
-	 *             )
-	 *         )
-	 *         ->setValue('password', '?');
-	 * </code>
-	 *
-	 * @param string $column The column into which the value should be inserted.
-	 * @param IParameter|string $value The value that should be inserted into the column.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function setValue($column, $value) {
-		$this->queryBuilder->setValue(
-			$this->helper->quoteColumnName($column),
-			(string) $value
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies values for an insert query indexed by column names.
-	 * Replaces any previous values, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param array $values The values to specify for the insert query indexed by column names.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function values(array $values) {
-		$quotedValues = [];
-		foreach ($values as $key => $value) {
-			$quotedValues[$this->helper->quoteColumnName($key)] = $value;
-		}
-
-		$this->queryBuilder->values($quotedValues);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies a restriction over the groups of the query.
-	 * Replaces any previous having restrictions, if any.
-	 *
-	 * @param mixed ...$having The restriction over the groups.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function having(...$having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'having'],
-			$having
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * conjunction with any existing having restrictions.
-	 *
-	 * @param mixed ...$having The restriction to append.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function andHaving(...$having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'andHaving'],
-			$having
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * disjunction with any existing having restrictions.
-	 *
-	 * @param mixed ...$having The restriction to add.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function orHaving(...$having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'orHaving'],
-			$having
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an ordering for the query results.
-	 * Replaces any previously specified orderings, if any.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function orderBy($sort, $order = null) {
-		$this->queryBuilder->orderBy(
-			$this->helper->quoteColumnName($sort),
-			$order
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds an ordering to the query results.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function addOrderBy($sort, $order = null) {
-		$this->queryBuilder->addOrderBy(
-			$this->helper->quoteColumnName($sort),
-			$order
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Gets a query part by its name.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return mixed
-	 */
-	public function getQueryPart($queryPartName) {
-		return $this->queryBuilder->getQueryPart($queryPartName);
-	}
-
-	/**
-	 * Gets all query parts.
-	 *
-	 * @return array
-	 */
-	public function getQueryParts() {
-		return $this->queryBuilder->getQueryParts();
-	}
-
-	/**
-	 * Resets SQL parts.
-	 *
-	 * @param array|null $queryPartNames
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function resetQueryParts($queryPartNames = null) {
-		$this->queryBuilder->resetQueryParts($queryPartNames);
-
-		return $this;
-	}
-
-	/**
-	 * Resets a single SQL part.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return $this This QueryBuilder instance.
-	 */
-	public function resetQueryPart($queryPartName) {
-		$this->queryBuilder->resetQueryPart($queryPartName);
-
-		return $this;
-	}
-
-	/**
-	 * Creates a new named parameter and bind the value $value to it.
-	 *
-	 * This method provides a shortcut for PDOStatement::bindValue
-	 * when using prepared statements.
-	 *
-	 * The parameter $value specifies the value that you want to bind. If
-	 * $placeholder is not provided bindValue() will automatically create a
-	 * placeholder for you. An automatic placeholder will be of the name
-	 * ':dcValue1', ':dcValue2' etc.
-	 *
-	 * For more information see {@link https://www.php.net/pdostatement-bindparam}
-	 *
-	 * Example:
-	 * <code>
-	 * $value = 2;
-	 * $q->eq( 'id', $q->bindValue( $value ) );
-	 * $stmt = $q->executeQuery(); // executed with 'id = 2'
-	 * </code>
-	 *
-	 * @license New BSD License
-	 * @link http://www.zetacomponents.org
-	 *
-	 * @param mixed $value
-	 * @param mixed $type
-	 * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
-	 *
-	 * @return IParameter the placeholder name used.
-	 */
-	public function createNamedParameter($value, $type = IQueryBuilder::PARAM_STR, $placeHolder = null) {
-		return new Parameter($this->queryBuilder->createNamedParameter($value, $type, $placeHolder));
-	}
-
-	/**
-	 * Creates a new positional parameter and bind the given value to it.
-	 *
-	 * Attention: If you are using positional parameters with the query builder you have
-	 * to be very careful to bind all parameters in the order they appear in the SQL
-	 * statement , otherwise they get bound in the wrong order which can lead to serious
-	 * bugs in your code.
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
-	 *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param mixed $value
-	 * @param integer $type
-	 *
-	 * @return IParameter
-	 */
-	public function createPositionalParameter($value, $type = IQueryBuilder::PARAM_STR) {
-		return new Parameter($this->queryBuilder->createPositionalParameter($value, $type));
-	}
-
-	/**
-	 * Creates a new parameter
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createParameter('name'))
-	 *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param string $name
-	 *
-	 * @return IParameter
-	 */
-	public function createParameter($name) {
-		return new Parameter(':' . $name);
-	}
-
-	/**
-	 * Creates a new function
-	 *
-	 * Attention: Column names inside the call have to be quoted before hand
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(*)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
-	 * </code>
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(`column`)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
-	 * </code>
-	 *
-	 * @param string $call
-	 *
-	 * @return IQueryFunction
-	 */
-	public function createFunction($call) {
-		return new QueryFunction($call);
-	}
-
-	/**
-	 * Used to get the id of the last inserted element
-	 * @return int
-	 * @throws \BadMethodCallException When being called before an insert query has been run.
-	 */
-	public function getLastInsertId(): int {
-		if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::INSERT && $this->lastInsertedTable) {
-			// lastInsertId() needs the prefix but no quotes
-			$table = $this->prefixTableName($this->lastInsertedTable);
-			return $this->connection->lastInsertId($table);
-		}
-
-		throw new \BadMethodCallException('Invalid call to getLastInsertId without using insert() before.');
-	}
-
-	/**
-	 * Returns the table name quoted and with database prefix as needed by the implementation
-	 *
-	 * @param string $table
-	 * @return string
-	 */
-	public function getTableName($table) {
-		if ($table instanceof IQueryFunction) {
-			return (string) $table;
-		}
-
-		$table = $this->prefixTableName($table);
-		return $this->helper->quoteColumnName($table);
-	}
-
-	/**
-	 * Returns the table name with database prefix as needed by the implementation
-	 *
-	 * @param string $table
-	 * @return string
-	 */
-	protected function prefixTableName($table) {
-		if ($this->automaticTablePrefix === false || strpos($table, '*PREFIX*') === 0) {
-			return $table;
-		}
-
-		return '*PREFIX*' . $table;
-	}
-
-	/**
-	 * Returns the column name quoted and with table alias prefix as needed by the implementation
-	 *
-	 * @param string $column
-	 * @param string $tableAlias
-	 * @return string
-	 */
-	public function getColumnName($column, $tableAlias = '') {
-		if ($tableAlias !== '') {
-			$tableAlias .= '.';
-		}
-
-		return $this->helper->quoteColumnName($tableAlias . $column);
-	}
-
-	/**
-	 * Returns the column name quoted and with table alias prefix as needed by the implementation
-	 *
-	 * @param string $alias
-	 * @return string
-	 */
-	public function quoteAlias($alias) {
-		if ($alias === '' || $alias === null) {
-			return $alias;
-		}
-
-		return $this->helper->quoteColumnName($alias);
-	}
+    /** @var ConnectionAdapter */
+    private $connection;
+
+    /** @var SystemConfig */
+    private $systemConfig;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var \Doctrine\DBAL\Query\QueryBuilder */
+    private $queryBuilder;
+
+    /** @var QuoteHelper */
+    private $helper;
+
+    /** @var bool */
+    private $automaticTablePrefix = true;
+
+    /** @var string */
+    protected $lastInsertedTable;
+
+    /**
+     * Initializes a new QueryBuilder.
+     *
+     * @param ConnectionAdapter $connection
+     * @param SystemConfig $systemConfig
+     * @param ILogger $logger
+     */
+    public function __construct(ConnectionAdapter $connection, SystemConfig $systemConfig, ILogger $logger) {
+        $this->connection = $connection;
+        $this->systemConfig = $systemConfig;
+        $this->logger = $logger;
+        $this->queryBuilder = new \Doctrine\DBAL\Query\QueryBuilder($this->connection->getInner());
+        $this->helper = new QuoteHelper();
+    }
+
+    /**
+     * Enable/disable automatic prefixing of table names with the oc_ prefix
+     *
+     * @param bool $enabled If set to true table names will be prefixed with the
+     * owncloud database prefix automatically.
+     * @since 8.2.0
+     */
+    public function automaticTablePrefix($enabled) {
+        $this->automaticTablePrefix = (bool) $enabled;
+    }
+
+    /**
+     * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->expr()->eq('u.id', 1));
+     * </code>
+     *
+     * For more complex expression construction, consider storing the expression
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IExpressionBuilder
+     */
+    public function expr() {
+        if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
+            return new OCIExpressionBuilder($this->connection, $this);
+        }
+        if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) {
+            return new PgSqlExpressionBuilder($this->connection, $this);
+        }
+        if ($this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
+            return new MySqlExpressionBuilder($this->connection, $this);
+        }
+        if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return new SqliteExpressionBuilder($this->connection, $this);
+        }
+
+        return new ExpressionBuilder($this->connection, $this);
+    }
+
+    /**
+     * Gets an FunctionBuilder used for object-oriented construction of query functions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->fun()->md5('u.id'));
+     * </code>
+     *
+     * For more complex function construction, consider storing the function
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IFunctionBuilder
+     */
+    public function func() {
+        if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
+            return new OCIFunctionBuilder($this->helper);
+        }
+        if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return new SqliteFunctionBuilder($this->helper);
+        }
+        if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) {
+            return new PgSqlFunctionBuilder($this->helper);
+        }
+
+        return new FunctionBuilder($this->helper);
+    }
+
+    /**
+     * Gets the type of the currently built query.
+     *
+     * @return integer
+     */
+    public function getType() {
+        return $this->queryBuilder->getType();
+    }
+
+    /**
+     * Gets the associated DBAL Connection for this query builder.
+     *
+     * @return \OCP\IDBConnection
+     */
+    public function getConnection() {
+        return $this->connection;
+    }
+
+    /**
+     * Gets the state of this query builder instance.
+     *
+     * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
+     */
+    public function getState() {
+        return $this->queryBuilder->getState();
+    }
+
+    /**
+     * Executes this query using the bound parameters and their types.
+     *
+     * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate}
+     * for insert, update and delete statements.
+     *
+     * @return IResult|int
+     */
+    public function execute() {
+        if ($this->systemConfig->getValue('log_query', false)) {
+            try {
+                $params = [];
+                foreach ($this->getParameters() as $placeholder => $value) {
+                    if ($value instanceof \DateTime) {
+                        $params[] = $placeholder . ' => DateTime:\'' . $value->format('c') . '\'';
+                    } elseif (is_array($value)) {
+                        $params[] = $placeholder . ' => (\'' . implode('\', \'', $value) . '\')';
+                    } else {
+                        $params[] = $placeholder . ' => \'' . $value . '\'';
+                    }
+                }
+                if (empty($params)) {
+                    $this->logger->debug('DB QueryBuilder: \'{query}\'', [
+                        'query' => $this->getSQL(),
+                        'app' => 'core',
+                    ]);
+                } else {
+                    $this->logger->debug('DB QueryBuilder: \'{query}\' with parameters: {params}', [
+                        'query' => $this->getSQL(),
+                        'params' => implode(', ', $params),
+                        'app' => 'core',
+                    ]);
+                }
+            } catch (\Error $e) {
+                // likely an error during conversion of $value to string
+                $this->logger->debug('DB QueryBuilder: error trying to log SQL query');
+                $this->logger->logException($e);
+            }
+        }
+
+        if (!empty($this->getQueryPart('select'))) {
+            $select = $this->getQueryPart('select');
+            $hasSelectAll = array_filter($select, static function ($s) {
+                return $s === '*';
+            });
+            $hasSelectSpecific = array_filter($select, static function ($s) {
+                return $s !== '*';
+            });
+
+            if (empty($hasSelectAll) === empty($hasSelectSpecific)) {
+                $exception = new QueryException('Query is selecting * and specific values in the same query. This is not supported in Oracle.');
+                $this->logger->logException($exception, [
+                    'message' => 'Query is selecting * and specific values in the same query. This is not supported in Oracle.',
+                    'query' => $this->getSQL(),
+                    'level' => ILogger::ERROR,
+                    'app' => 'core',
+                ]);
+            }
+        }
+
+        $numberOfParameters = 0;
+        $hasTooLargeArrayParameter = false;
+        foreach ($this->getParameters() as $parameter) {
+            if (is_array($parameter)) {
+                $count = count($parameter);
+                $numberOfParameters += $count;
+                $hasTooLargeArrayParameter = $hasTooLargeArrayParameter || ($count > 1000);
+            }
+        }
+
+        if ($hasTooLargeArrayParameter) {
+            $exception = new QueryException('More than 1000 expressions in a list are not allowed on Oracle.');
+            $this->logger->logException($exception, [
+                'message' => 'More than 1000 expressions in a list are not allowed on Oracle.',
+                'query' => $this->getSQL(),
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+        }
+
+        if ($numberOfParameters > 65535) {
+            $exception = new QueryException('The number of parameters must not exceed 65535. Restriction by PostgreSQL.');
+            $this->logger->logException($exception, [
+                'message' => 'The number of parameters must not exceed 65535. Restriction by PostgreSQL.',
+                'query' => $this->getSQL(),
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+        }
+
+        $result = $this->queryBuilder->execute();
+        if (is_int($result)) {
+            return $result;
+        }
+        return new ResultAdapter($result);
+    }
+
+    public function executeQuery(): IResult {
+        if ($this->getType() !== \Doctrine\DBAL\Query\QueryBuilder::SELECT) {
+            throw new \RuntimeException('Invalid query type, expected SELECT query');
+        }
+
+        try {
+            $result = $this->execute();
+        } catch (\Doctrine\DBAL\Exception $e) {
+            throw \OC\DB\Exceptions\DbalException::wrap($e);
+        }
+
+        if ($result instanceof IResult) {
+            return $result;
+        }
+
+        throw new \RuntimeException('Invalid return type for query');
+    }
+
+    /**
+     * Monkey-patched compatibility layer for apps that were adapted for Nextcloud 22 before
+     * the first beta, where executeStatement was named executeUpdate.
+     *
+     * Static analysis should catch those misuses, but until then let's try to keep things
+     * running.
+     *
+     * @internal
+     * @deprecated
+     * @todo drop ASAP
+     */
+    public function executeUpdate(): int {
+        return $this->executeStatement();
+    }
+
+    public function executeStatement(): int {
+        if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::SELECT) {
+            throw new \RuntimeException('Invalid query type, expected INSERT, DELETE or UPDATE statement');
+        }
+
+        try {
+            $result = $this->execute();
+        } catch (\Doctrine\DBAL\Exception $e) {
+            throw \OC\DB\Exceptions\DbalException::wrap($e);
+        }
+
+        if (!is_int($result)) {
+            throw new \RuntimeException('Invalid return type for statement');
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('User', 'u')
+     *     echo $qb->getSQL(); // SELECT u FROM User u
+     * </code>
+     *
+     * @return string The SQL query string.
+     */
+    public function getSQL() {
+        return $this->queryBuilder->getSQL();
+    }
+
+    /**
+     * Sets a query parameter for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id')
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string|integer $key The parameter position or name.
+     * @param mixed $value The parameter value.
+     * @param string|null|int $type One of the IQueryBuilder::PARAM_* constants.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function setParameter($key, $value, $type = null) {
+        $this->queryBuilder->setParameter($key, $value, $type);
+
+        return $this;
+    }
+
+    /**
+     * Sets a collection of query parameters for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id1 OR u.id = :user_id2')
+     *         ->setParameters(array(
+     *             ':user_id1' => 1,
+     *             ':user_id2' => 2
+     *         ));
+     * </code>
+     *
+     * @param array $params The query parameters to set.
+     * @param array $types The query parameters types to set.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function setParameters(array $params, array $types = []) {
+        $this->queryBuilder->setParameters($params, $types);
+
+        return $this;
+    }
+
+    /**
+     * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameters indexed by parameter index or name.
+     */
+    public function getParameters() {
+        return $this->queryBuilder->getParameters();
+    }
+
+    /**
+     * Gets a (previously set) query parameter of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter.
+     *
+     * @return mixed The value of the bound parameter.
+     */
+    public function getParameter($key) {
+        return $this->queryBuilder->getParameter($key);
+    }
+
+    /**
+     * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameter types indexed by parameter index or name.
+     */
+    public function getParameterTypes() {
+        return $this->queryBuilder->getParameterTypes();
+    }
+
+    /**
+     * Gets a (previously set) query parameter type of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter type.
+     *
+     * @return mixed The value of the bound parameter type.
+     */
+    public function getParameterType($key) {
+        return $this->queryBuilder->getParameterType($key);
+    }
+
+    /**
+     * Sets the position of the first result to retrieve (the "offset").
+     *
+     * @param integer $firstResult The first result to return.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function setFirstResult($firstResult) {
+        $this->queryBuilder->setFirstResult($firstResult);
+
+        return $this;
+    }
+
+    /**
+     * Gets the position of the first result the query object was set to retrieve (the "offset").
+     * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
+     *
+     * @return integer The position of the first result.
+     */
+    public function getFirstResult() {
+        return $this->queryBuilder->getFirstResult();
+    }
+
+    /**
+     * Sets the maximum number of results to retrieve (the "limit").
+     *
+     * NOTE: Setting max results to "0" will cause mixed behaviour. While most
+     * of the databases will just return an empty result set, Oracle will return
+     * all entries.
+     *
+     * @param integer $maxResults The maximum number of results to retrieve.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function setMaxResults($maxResults) {
+        $this->queryBuilder->setMaxResults($maxResults);
+
+        return $this;
+    }
+
+    /**
+     * Gets the maximum number of results the query object was set to retrieve (the "limit").
+     * Returns NULL if {@link setMaxResults} was not applied to this query builder.
+     *
+     * @return int|null The maximum number of results.
+     */
+    public function getMaxResults() {
+        return $this->queryBuilder->getMaxResults();
+    }
+
+    /**
+     * Specifies an item that is to be returned in the query result.
+     * Replaces any previously specified selections, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id', 'p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed ...$selects The selection expressions.
+     *
+     * '@return $this This QueryBuilder instance.
+     */
+    public function select(...$selects) {
+        if (count($selects) === 1 && is_array($selects[0])) {
+            $selects = $selects[0];
+        }
+
+        $this->queryBuilder->select(
+            $this->helper->quoteColumnNames($selects)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an item that is to be returned with a different name in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectAlias('u.id', 'user_id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     * @param string $alias The column alias used in the constructed query.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function selectAlias($select, $alias) {
+        $this->queryBuilder->addSelect(
+            $this->helper->quoteColumnName($select) . ' AS ' . $this->helper->quoteColumnName($alias)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an item that is to be returned uniquely in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectDistinct('type')
+     *         ->from('users');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function selectDistinct($select) {
+        if (!is_array($select)) {
+            $select = [$select];
+        }
+
+        $quotedSelect = $this->helper->quoteColumnNames($select);
+
+        $this->queryBuilder->addSelect(
+            'DISTINCT ' . implode(', ', $quotedSelect)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds an item that is to be returned in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->addSelect('p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed ...$selects The selection expression.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function addSelect(...$selects) {
+        if (count($selects) === 1 && is_array($selects[0])) {
+            $selects = $selects[0];
+        }
+
+        $this->queryBuilder->addSelect(
+            $this->helper->quoteColumnNames($selects)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into a bulk delete query that ranges over
+     * a certain table.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->delete('users', 'u')
+     *         ->where('u.id = :user_id');
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string $delete The table whose rows are subject to the deletion.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function delete($delete = null, $alias = null) {
+        $this->queryBuilder->delete(
+            $this->getTableName($delete),
+            $alias
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into a bulk update query that ranges over
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $update The table whose rows are subject to the update.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function update($update = null, $alias = null) {
+        $this->queryBuilder->update(
+            $this->getTableName($update),
+            $alias
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into an insert query that inserts into
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param string $insert The table into which the rows should be inserted.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function insert($insert = null) {
+        $this->queryBuilder->insert(
+            $this->getTableName($insert)
+        );
+
+        $this->lastInsertedTable = $insert;
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a query root corresponding to the table identified by the
+     * given alias, forming a cartesian product with any existing query roots.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->from('users', 'u')
+     * </code>
+     *
+     * @param string $from The table.
+     * @param string|null $alias The alias of the table.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function from($from, $alias = null) {
+        $this->queryBuilder->from(
+            $this->getTableName($from),
+            $this->quoteAlias($alias)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string|ICompositeExpression|null $condition The condition for the join.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function join($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->join(
+            $this->quoteAlias($fromAlias),
+            $this->getTableName($join),
+            $this->quoteAlias($alias),
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string|ICompositeExpression|null $condition The condition for the join.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function innerJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->innerJoin(
+            $this->quoteAlias($fromAlias),
+            $this->getTableName($join),
+            $this->quoteAlias($alias),
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a left join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string|ICompositeExpression|null $condition The condition for the join.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function leftJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->leftJoin(
+            $this->quoteAlias($fromAlias),
+            $this->getTableName($join),
+            $this->quoteAlias($alias),
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a right join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string|ICompositeExpression|null $condition The condition for the join.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function rightJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->rightJoin(
+            $this->quoteAlias($fromAlias),
+            $this->getTableName($join),
+            $this->quoteAlias($alias),
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Sets a new value for a column in a bulk update query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $key The column to set.
+     * @param ILiteral|IParameter|IQueryFunction|string $value The value, expression, placeholder, etc.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function set($key, $value) {
+        $this->queryBuilder->set(
+            $this->helper->quoteColumnName($key),
+            $this->helper->quoteColumnName($value)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies one or more restrictions to the query result.
+     * Replaces any previously specified restrictions, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = ?');
+     *
+     *     // You can optionally programatically build and/or expressions
+     *     $qb = $conn->getQueryBuilder();
+     *
+     *     $or = $qb->expr()->orx();
+     *     $or->add($qb->expr()->eq('u.id', 1));
+     *     $or->add($qb->expr()->eq('u.id', 2));
+     *
+     *     $qb->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where($or);
+     * </code>
+     *
+     * @param mixed ...$predicates The restriction predicates.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function where(...$predicates) {
+        call_user_func_array(
+            [$this->queryBuilder, 'where'],
+            $predicates
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * conjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.username LIKE ?')
+     *         ->andWhere('u.is_active = 1');
+     * </code>
+     *
+     * @param mixed ...$where The query restrictions.
+     *
+     * @return $this This QueryBuilder instance.
+     *
+     * @see where()
+     */
+    public function andWhere(...$where) {
+        call_user_func_array(
+            [$this->queryBuilder, 'andWhere'],
+            $where
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * disjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = 1')
+     *         ->orWhere('u.id = 2');
+     * </code>
+     *
+     * @param mixed ...$where The WHERE statement.
+     *
+     * @return $this This QueryBuilder instance.
+     *
+     * @see where()
+     */
+    public function orWhere(...$where) {
+        call_user_func_array(
+            [$this->queryBuilder, 'orWhere'],
+            $where
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies a grouping over the results of the query.
+     * Replaces any previously specified groupings, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.id');
+     * </code>
+     *
+     * @param mixed ...$groupBys The grouping expression.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function groupBy(...$groupBys) {
+        if (count($groupBys) === 1 && is_array($groupBys[0])) {
+            $groupBys = $groupBys[0];
+        }
+
+        call_user_func_array(
+            [$this->queryBuilder, 'groupBy'],
+            $this->helper->quoteColumnNames($groupBys)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a grouping expression to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.lastLogin');
+     *         ->addGroupBy('u.createdAt')
+     * </code>
+     *
+     * @param mixed ...$groupBy The grouping expression.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function addGroupBy(...$groupBys) {
+        if (count($groupBys) === 1 && is_array($groupBys[0])) {
+            $$groupBys = $groupBys[0];
+        }
+
+        call_user_func_array(
+            [$this->queryBuilder, 'addGroupBy'],
+            $this->helper->quoteColumnNames($groupBys)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Sets a value for a column in an insert query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?'
+     *             )
+     *         )
+     *         ->setValue('password', '?');
+     * </code>
+     *
+     * @param string $column The column into which the value should be inserted.
+     * @param IParameter|string $value The value that should be inserted into the column.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function setValue($column, $value) {
+        $this->queryBuilder->setValue(
+            $this->helper->quoteColumnName($column),
+            (string) $value
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies values for an insert query indexed by column names.
+     * Replaces any previous values, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param array $values The values to specify for the insert query indexed by column names.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function values(array $values) {
+        $quotedValues = [];
+        foreach ($values as $key => $value) {
+            $quotedValues[$this->helper->quoteColumnName($key)] = $value;
+        }
+
+        $this->queryBuilder->values($quotedValues);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a restriction over the groups of the query.
+     * Replaces any previous having restrictions, if any.
+     *
+     * @param mixed ...$having The restriction over the groups.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function having(...$having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'having'],
+            $having
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * conjunction with any existing having restrictions.
+     *
+     * @param mixed ...$having The restriction to append.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function andHaving(...$having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'andHaving'],
+            $having
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * disjunction with any existing having restrictions.
+     *
+     * @param mixed ...$having The restriction to add.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function orHaving(...$having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'orHaving'],
+            $having
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an ordering for the query results.
+     * Replaces any previously specified orderings, if any.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function orderBy($sort, $order = null) {
+        $this->queryBuilder->orderBy(
+            $this->helper->quoteColumnName($sort),
+            $order
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds an ordering to the query results.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function addOrderBy($sort, $order = null) {
+        $this->queryBuilder->addOrderBy(
+            $this->helper->quoteColumnName($sort),
+            $order
+        );
+
+        return $this;
+    }
+
+    /**
+     * Gets a query part by its name.
+     *
+     * @param string $queryPartName
+     *
+     * @return mixed
+     */
+    public function getQueryPart($queryPartName) {
+        return $this->queryBuilder->getQueryPart($queryPartName);
+    }
+
+    /**
+     * Gets all query parts.
+     *
+     * @return array
+     */
+    public function getQueryParts() {
+        return $this->queryBuilder->getQueryParts();
+    }
+
+    /**
+     * Resets SQL parts.
+     *
+     * @param array|null $queryPartNames
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function resetQueryParts($queryPartNames = null) {
+        $this->queryBuilder->resetQueryParts($queryPartNames);
+
+        return $this;
+    }
+
+    /**
+     * Resets a single SQL part.
+     *
+     * @param string $queryPartName
+     *
+     * @return $this This QueryBuilder instance.
+     */
+    public function resetQueryPart($queryPartName) {
+        $this->queryBuilder->resetQueryPart($queryPartName);
+
+        return $this;
+    }
+
+    /**
+     * Creates a new named parameter and bind the value $value to it.
+     *
+     * This method provides a shortcut for PDOStatement::bindValue
+     * when using prepared statements.
+     *
+     * The parameter $value specifies the value that you want to bind. If
+     * $placeholder is not provided bindValue() will automatically create a
+     * placeholder for you. An automatic placeholder will be of the name
+     * ':dcValue1', ':dcValue2' etc.
+     *
+     * For more information see {@link https://www.php.net/pdostatement-bindparam}
+     *
+     * Example:
+     * <code>
+     * $value = 2;
+     * $q->eq( 'id', $q->bindValue( $value ) );
+     * $stmt = $q->executeQuery(); // executed with 'id = 2'
+     * </code>
+     *
+     * @license New BSD License
+     * @link http://www.zetacomponents.org
+     *
+     * @param mixed $value
+     * @param mixed $type
+     * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
+     *
+     * @return IParameter the placeholder name used.
+     */
+    public function createNamedParameter($value, $type = IQueryBuilder::PARAM_STR, $placeHolder = null) {
+        return new Parameter($this->queryBuilder->createNamedParameter($value, $type, $placeHolder));
+    }
+
+    /**
+     * Creates a new positional parameter and bind the given value to it.
+     *
+     * Attention: If you are using positional parameters with the query builder you have
+     * to be very careful to bind all parameters in the order they appear in the SQL
+     * statement , otherwise they get bound in the wrong order which can lead to serious
+     * bugs in your code.
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
+     *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param mixed $value
+     * @param integer $type
+     *
+     * @return IParameter
+     */
+    public function createPositionalParameter($value, $type = IQueryBuilder::PARAM_STR) {
+        return new Parameter($this->queryBuilder->createPositionalParameter($value, $type));
+    }
+
+    /**
+     * Creates a new parameter
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createParameter('name'))
+     *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param string $name
+     *
+     * @return IParameter
+     */
+    public function createParameter($name) {
+        return new Parameter(':' . $name);
+    }
+
+    /**
+     * Creates a new function
+     *
+     * Attention: Column names inside the call have to be quoted before hand
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(*)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
+     * </code>
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(`column`)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
+     * </code>
+     *
+     * @param string $call
+     *
+     * @return IQueryFunction
+     */
+    public function createFunction($call) {
+        return new QueryFunction($call);
+    }
+
+    /**
+     * Used to get the id of the last inserted element
+     * @return int
+     * @throws \BadMethodCallException When being called before an insert query has been run.
+     */
+    public function getLastInsertId(): int {
+        if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::INSERT && $this->lastInsertedTable) {
+            // lastInsertId() needs the prefix but no quotes
+            $table = $this->prefixTableName($this->lastInsertedTable);
+            return $this->connection->lastInsertId($table);
+        }
+
+        throw new \BadMethodCallException('Invalid call to getLastInsertId without using insert() before.');
+    }
+
+    /**
+     * Returns the table name quoted and with database prefix as needed by the implementation
+     *
+     * @param string $table
+     * @return string
+     */
+    public function getTableName($table) {
+        if ($table instanceof IQueryFunction) {
+            return (string) $table;
+        }
+
+        $table = $this->prefixTableName($table);
+        return $this->helper->quoteColumnName($table);
+    }
+
+    /**
+     * Returns the table name with database prefix as needed by the implementation
+     *
+     * @param string $table
+     * @return string
+     */
+    protected function prefixTableName($table) {
+        if ($this->automaticTablePrefix === false || strpos($table, '*PREFIX*') === 0) {
+            return $table;
+        }
+
+        return '*PREFIX*' . $table;
+    }
+
+    /**
+     * Returns the column name quoted and with table alias prefix as needed by the implementation
+     *
+     * @param string $column
+     * @param string $tableAlias
+     * @return string
+     */
+    public function getColumnName($column, $tableAlias = '') {
+        if ($tableAlias !== '') {
+            $tableAlias .= '.';
+        }
+
+        return $this->helper->quoteColumnName($tableAlias . $column);
+    }
+
+    /**
+     * Returns the column name quoted and with table alias prefix as needed by the implementation
+     *
+     * @param string $alias
+     * @return string
+     */
+    public function quoteAlias($alias) {
+        if ($alias === '' || $alias === null) {
+            return $alias;
+        }
+
+        return $this->helper->quoteColumnName($alias);
+    }
 }