From b4a166e1cc365d58ed63bc6e490fdb8ae8c7f566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 19 Mar 2024 16:11:30 +0100 Subject: [PATCH] chore: Remove typed properties to support 7.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 23 still supports PHP 7.3 Signed-off-by: Côme Chilliet --- .../lib/SystemTag/SystemTagMappingNode.php | 21 ++++++++++++------- .../SystemTagsObjectMappingCollection.php | 18 ++++++++++------ .../SystemTagsObjectTypeCollection.php | 21 ++++++++++++------- .../SystemTag/SystemTagMappingNodeTest.php | 9 +++++--- .../SystemTagsObjectMappingCollectionTest.php | 9 +++++--- 5 files changed, 52 insertions(+), 26 deletions(-) diff --git a/apps/dav/lib/SystemTag/SystemTagMappingNode.php b/apps/dav/lib/SystemTag/SystemTagMappingNode.php index 68e52ea9514..a0dc855778b 100644 --- a/apps/dav/lib/SystemTag/SystemTagMappingNode.php +++ b/apps/dav/lib/SystemTag/SystemTagMappingNode.php @@ -37,13 +37,20 @@ 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; + /** @var ISystemTag */ + private $tag; + /** @var string */ + private $objectId; + /** @var string */ + private $objectType; + /** @var IUser */ + private $user; + /** @var ISystemTagManager */ + private $tagManager; + /** @var ISystemTagObjectMapper */ + private $tagMapper; + /** @var \Closure */ + private $childWriteAccessFunction; public function __construct( ISystemTag $tag, diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php index fba4ac64fb6..7b6d5279d5d 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php @@ -40,12 +40,18 @@ 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; + /** @var string */ + private $objectId; + /** @var string */ + private $objectType; + /** @var IUser */ + private $user; + /** @var ISystemTagManager */ + private $tagManager; + /** @var ISystemTagObjectMapper */ + private $tagMapper; + /** @var \Closure */ + protected $childWriteAccessFunction; public function __construct( string $objectId, diff --git a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php index d989bdb9683..fe9d0acff23 100644 --- a/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php +++ b/apps/dav/lib/SystemTag/SystemTagsObjectTypeCollection.php @@ -38,13 +38,20 @@ 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; + /** @var string */ + private $objectType; + /** @var ISystemTagManager */ + private $tagManager; + /** @var ISystemTagObjectMapper */ + private $tagMapper; + /** @var IUserSession */ + private $userSession; + /** @var IGroupManager */ + private $groupManager; + /** @var \Closure */ + protected $childExistsFunction; + /** @var \Closure */ + protected $childWriteAccessFunction; public function __construct( string $objectType, diff --git a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php index 287e7c568b8..f1af249186e 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagMappingNodeTest.php @@ -33,9 +33,12 @@ use OCP\SystemTag\ISystemTagObjectMapper; use OCP\SystemTag\TagNotFoundException; class SystemTagMappingNodeTest extends \Test\TestCase { - private ISystemTagManager $tagManager; - private ISystemTagObjectMapper $tagMapper; - private IUser $user; + /** @var ISystemTagManager */ + private $tagManager; + /** @var ISystemTagObjectMapper */ + private $tagMapper; + /** @var IUser */ + private $user; protected function setUp(): void { parent::setUp(); diff --git a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php index 8e0b7199d82..3f3aa4e4695 100644 --- a/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php +++ b/apps/dav/tests/unit/SystemTag/SystemTagsObjectMappingCollectionTest.php @@ -32,9 +32,12 @@ use OCP\SystemTag\ISystemTagObjectMapper; use OCP\SystemTag\TagNotFoundException; class SystemTagsObjectMappingCollectionTest extends \Test\TestCase { - private ISystemTagManager $tagManager; - private ISystemTagObjectMapper $tagMapper; - private IUser $user; + /** @var ISystemTagManager */ + private $tagManager; + /** @var ISystemTagObjectMapper */ + private $tagMapper; + /** @var IUser */ + private $user; protected function setUp(): void { parent::setUp();