4 files changed, 24 insertions, 50 deletions

diff --git a/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php b/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php
index 3ef147fe200..d8c429f2056 100644
--- a/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php
+++ b/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObject.php
@@ -18,26 +18,13 @@ use Sabre\DAVACL\IACL;
 class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
 	use ACLTrait;
 
-	/** @var string */
-	private $name;
-
-	/** @var mixed[] */
-	private $objectData;
-
-	/** @var string */
-	private $principalUri;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	public function __construct(string $name,
-		array $objectData,
-		string $principalUri,
-		CalDavBackend $calDavBackend) {
-		$this->name = $name;
-		$this->objectData = $objectData;
-		$this->calDavBackend = $calDavBackend;
-		$this->principalUri = $principalUri;
+	public function __construct(
+		private string $name,
+		/** @var mixed[] */
+		private array $objectData,
+		private string $principalUri,
+		private CalDavBackend $calDavBackend,
+	) {
 	}
 
 	public function delete() {
@@ -72,7 +59,7 @@ class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
 	public function getContentType() {
 		$mime = 'text/calendar; charset=utf-8';
 		if (isset($this->objectData['component']) && $this->objectData['component']) {
-			$mime .= '; component='.$this->objectData['component'];
+			$mime .= '; component=' . $this->objectData['component'];
 		}
 
 		return $mime;
@@ -83,7 +70,7 @@ class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
 	}
 
 	public function getSize() {
-		return (int) $this->objectData['size'];
+		return (int)$this->objectData['size'];
 	}
 
 	public function restore(): void {
@@ -91,7 +78,7 @@ class DeletedCalendarObject implements IACL, ICalendarObject, IRestorable {
 	}
 
 	public function getDeletedAt(): ?int {
-		return $this->objectData['deleted_at'] ? (int) $this->objectData['deleted_at'] : null;
+		return $this->objectData['deleted_at'] ? (int)$this->objectData['deleted_at'] : null;
 	}
 
 	public function getCalendarUri(): string {
diff --git a/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php b/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php
index abf5f001e71..f75e19689f1 100644
--- a/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php
+++ b/apps/dav/lib/CalDAV/Trashbin/DeletedCalendarObjectsCollection.php
@@ -25,16 +25,11 @@ class DeletedCalendarObjectsCollection implements ICalendarObjectContainer, IACL
 
 	public const NAME = 'objects';
 
-	/** @var CalDavBackend */
-	protected $caldavBackend;
-
-	/** @var mixed[] */
-	private $principalInfo;
-
-	public function __construct(CalDavBackend $caldavBackend,
-		array $principalInfo) {
-		$this->caldavBackend = $caldavBackend;
-		$this->principalInfo = $principalInfo;
+	public function __construct(
+		protected CalDavBackend $caldavBackend,
+		/** @var mixed[] */
+		private array $principalInfo,
+	) {
 	}
 
 	/**
@@ -51,7 +46,7 @@ class DeletedCalendarObjectsCollection implements ICalendarObjectContainer, IACL
 
 		$data = $this->caldavBackend->getCalendarObjectById(
 			$this->principalInfo['uri'],
-			(int) $matches[1],
+			(int)$matches[1],
 		);
 
 		// If the object hasn't been deleted yet then we don't want to find it here
diff --git a/apps/dav/lib/CalDAV/Trashbin/Plugin.php b/apps/dav/lib/CalDAV/Trashbin/Plugin.php
index f3c8342c475..6f58b1f3110 100644
--- a/apps/dav/lib/CalDAV/Trashbin/Plugin.php
+++ b/apps/dav/lib/CalDAV/Trashbin/Plugin.php
@@ -32,16 +32,14 @@ class Plugin extends ServerPlugin {
 	/** @var bool */
 	private $disableTrashbin;
 
-	/** @var RetentionService */
-	private $retentionService;
-
 	/** @var Server */
 	private $server;
 
-	public function __construct(IRequest $request,
-		RetentionService $retentionService) {
+	public function __construct(
+		IRequest $request,
+		private RetentionService $retentionService,
+	) {
 		$this->disableTrashbin = $request->getHeader('X-NC-CalDAV-No-Trashbin') === '1';
-		$this->retentionService = $retentionService;
 	}
 
 	public function initialize(Server $server): void {
diff --git a/apps/dav/lib/CalDAV/Trashbin/TrashbinHome.php b/apps/dav/lib/CalDAV/Trashbin/TrashbinHome.php
index a1958bb2794..1c76bd2295d 100644
--- a/apps/dav/lib/CalDAV/Trashbin/TrashbinHome.php
+++ b/apps/dav/lib/CalDAV/Trashbin/TrashbinHome.php
@@ -26,16 +26,10 @@ class TrashbinHome implements IACL, ICollection, IProperties {
 
 	public const NAME = 'trashbin';
 
-	/** @var CalDavBackend */
-	private $caldavBackend;
-
-	/** @var array */
-	private $principalInfo;
-
-	public function __construct(CalDavBackend $caldavBackend,
-		array $principalInfo) {
-		$this->caldavBackend = $caldavBackend;
-		$this->principalInfo = $principalInfo;
+	public function __construct(
+		private CalDavBackend $caldavBackend,
+		private array $principalInfo,
+	) {
 	}
 
 	public function getOwner(): string {