From 5dd565dbc0e473103a3860dae66ef8bb143863d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Tue, 19 Mar 2024 14:28:54 +0100
Subject: [PATCH] chore: Remove PHP8 constructor property promotions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

25 supports 7.4

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 .../lib/SystemTag/SystemTagMappingNode.php    | 29 ++++++++++++++-----
 .../SystemTagsObjectMappingCollection.php     | 25 ++++++++++++----
 .../SystemTagsObjectTypeCollection.php        | 29 ++++++++++++++-----
 3 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/apps/dav/lib/SystemTag/SystemTagMappingNode.php b/apps/dav/lib/SystemTag/SystemTagMappingNode.php
index 96180d0e0d6..68e52ea9514 100644
--- a/apps/dav/lib/SystemTag/SystemTagMappingNode.php
+++ b/apps/dav/lib/SystemTag/SystemTagMappingNode.php
@@ -37,15 +37,30 @@ use Sabre\DAV\Exception\NotFound;
  * Mapping node for system tag to object id
  */
 class SystemTagMappingNode implements \Sabre\DAV\INode {
+	private ISystemTag $tag;
+	private string $objectId;
+	private string $objectType;
+	private IUser $user;
+	private ISystemTagManager $tagManager;
+	private ISystemTagObjectMapper $tagMapper;
+	private \Closure $childWriteAccessFunction;
+
 	public function __construct(
-		private ISystemTag $tag,
-		private string $objectId,
-		private string $objectType,
-		private IUser $user,
-		private ISystemTagManager $tagManager,
-		private ISystemTagObjectMapper $tagMapper,
-		private \Closure $childWriteAccessFunction,
+		ISystemTag $tag,
+		string $objectId,
+		string $objectType,
+		IUser $user,
+		ISystemTagManager $tagManager,
+		ISystemTagObjectMapper $tagMapper,
+		\Closure $childWriteAccessFunction
 	) {
+		$this->tag = $tag;
+		$this->objectId = $objectId;
+		$this->objectType = $objectType;
+		$this->user = $user;
+		$this->tagManager = $tagManager;
+		$this->tagMapper = $tagMapper;
+		$this->childWriteAccessFunction = $childWriteAccessFunction;
 	}
 
 	/**
diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
index 38b2c3b2f82..fba4ac64fb6 100644
--- a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
+++ b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
@@ -40,14 +40,27 @@ use Sabre\DAV\ICollection;
  * Collection containing tags by object id
  */
 class SystemTagsObjectMappingCollection implements ICollection {
+	private string $objectId;
+	private string $objectType;
+	private IUser $user;
+	private ISystemTagManager $tagManager;
+	private ISystemTagObjectMapper $tagMapper;
+	protected \Closure $childWriteAccessFunction;
+
 	public function __construct(
-		private string $objectId,
-		private string $objectType,
-		private IUser $user,
-		private ISystemTagManager $tagManager,
-		private ISystemTagObjectMapper $tagMapper,
-		protected \Closure $childWriteAccessFunction,
+		string $objectId,
+		string $objectType,
+		IUser $user,
+		ISystemTagManager $tagManager,
+		ISystemTagObjectMapper $tagMapper,
+		\Closure $childWriteAccessFunction
 	) {
+		$this->objectId = $objectId;
+		$this->objectType = $objectType;
+		$this->user = $user;
+		$this->tagManager = $tagManager;
+		$this->tagMapper = $tagMapper;
+		$this->childWriteAccessFunction = $childWriteAccessFunction;
 	}
 
 	public function createFile($name, $data = null) {
diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php
index 945183519e7..d989bdb9683 100644
--- a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php
+++ b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php
@@ -38,15 +38,30 @@ use Sabre\DAV\ICollection;
  * Collection containing object ids by object type
  */
 class SystemTagsObjectTypeCollection implements ICollection {
+	private string $objectType;
+	private ISystemTagManager $tagManager;
+	private ISystemTagObjectMapper $tagMapper;
+	private IUserSession $userSession;
+	private IGroupManager $groupManager;
+	protected \Closure $childExistsFunction;
+	protected \Closure $childWriteAccessFunction;
+
 	public function __construct(
-		private string $objectType,
-		private ISystemTagManager $tagManager,
-		private ISystemTagObjectMapper $tagMapper,
-		private IUserSession $userSession,
-		private IGroupManager $groupManager,
-		protected \Closure $childExistsFunction,
-		protected \Closure $childWriteAccessFunction,
+		string $objectType,
+		ISystemTagManager $tagManager,
+		ISystemTagObjectMapper $tagMapper,
+		IUserSession $userSession,
+		IGroupManager $groupManager,
+		\Closure $childExistsFunction,
+		\Closure $childWriteAccessFunction
 	) {
+		$this->objectType = $objectType;
+		$this->tagManager = $tagManager;
+		$this->tagMapper = $tagMapper;
+		$this->userSession = $userSession;
+		$this->groupManager = $groupManager;
+		$this->childExistsFunction = $childExistsFunction;
+		$this->childWriteAccessFunction = $childWriteAccessFunction;
 	}
 
 	/**