fixup! Add a trashbin for calendars and calendar objects

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

apps/dav/lib/CalDAV/CalendarHome.php

@@ -39,6 +39,7 @@
 use Sabre\CalDAV\Subscriptions\Subscription;
 use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\INode;
 use Sabre\DAV\MkCol;
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
@@ -75,7 +76,7 @@ public function getCalDAVBackend() {
 	/**
 	 * @inheritdoc
 	 */
-	public function createExtendedCollection($name, MkCol $mkCol) {
+	public function createExtendedCollection($name, MkCol $mkCol): void {
 		$reservedNames = [
 			BirthdayService::BIRTHDAY_CALENDAR_URI,
 			TrashbinHome::NAME,
@@ -135,7 +136,9 @@ public function getChildren() {
 	}
 
 	/**
-	 * @inheritdoc
+	 * @param string $name
+	 *
+	 * @return INode
 	 */
 	public function getChild($name) {
 		// Special nodes

apps/dav/lib/CalDAV/RetentionService.php

@@ -51,7 +51,7 @@ public function __construct(IConfig $config,
 
 	public function cleanUp(): void {
 		$retentionTime = max(
-			(int) $this->config->getAppValue(Application::APP_ID, 'calendarRetentionObligation', 30 * 24 * 60 * 60),
+			(int) $this->config->getAppValue(Application::APP_ID, 'calendarRetentionObligation', (string) (30 * 24 * 60 * 60)),
 			0 // Just making sure we don't delete things in the future when a negative number is passed
 		);
 		$now = $this->time->getTime();

lib/composer/composer/installed.json

@@ -1 +1,5 @@
-[]
+{
+    "packages": [],
+    "dev": false,
+    "dev-package-names": []
+}