aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_versions/lib/Sabre
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_versions/lib/Sabre')
-rw-r--r--apps/files_versions/lib/Sabre/Plugin.php15
-rw-r--r--apps/files_versions/lib/Sabre/RootCollection.php26
-rw-r--r--apps/files_versions/lib/Sabre/VersionCollection.php18
-rw-r--r--apps/files_versions/lib/Sabre/VersionFile.php4
-rw-r--r--apps/files_versions/lib/Sabre/VersionHome.php24
-rw-r--r--apps/files_versions/lib/Sabre/VersionRoot.php18
6 files changed, 35 insertions, 70 deletions
diff --git a/apps/files_versions/lib/Sabre/Plugin.php b/apps/files_versions/lib/Sabre/Plugin.php
index c2ffcdebe47..984c4a36e5b 100644
--- a/apps/files_versions/lib/Sabre/Plugin.php
+++ b/apps/files_versions/lib/Sabre/Plugin.php
@@ -24,6 +24,10 @@ use Sabre\HTTP\ResponseInterface;
class Plugin extends ServerPlugin {
private Server $server;
+ public const LABEL = 'label';
+
+ public const AUTHOR = 'author';
+
public const VERSION_LABEL = '{http://nextcloud.org/ns}version-label';
public const VERSION_AUTHOR = '{http://nextcloud.org/ns}version-author'; // dav property for author
@@ -76,9 +80,12 @@ class Plugin extends ServerPlugin {
public function propFind(PropFind $propFind, INode $node): void {
if ($node instanceof VersionFile) {
- $propFind->handle(self::VERSION_LABEL, fn () => $node->getMetadataValue('label'));
- $propFind->handle(self::VERSION_AUTHOR, fn () => $node->getMetadataValue("author"));
- $propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, fn () => $this->previewManager->isMimeSupported($node->getContentType()));
+ $propFind->handle(self::VERSION_LABEL, fn () => $node->getMetadataValue(self::LABEL));
+ $propFind->handle(self::VERSION_AUTHOR, fn () => $node->getMetadataValue(self::AUTHOR));
+ $propFind->handle(
+ FilesPlugin::HAS_PREVIEW_PROPERTYNAME,
+ fn (): string => $this->previewManager->isMimeSupported($node->getContentType()) ? 'true' : 'false',
+ );
}
}
@@ -86,7 +93,7 @@ class Plugin extends ServerPlugin {
$node = $this->server->tree->getNodeForPath($path);
if ($node instanceof VersionFile) {
- $propPatch->handle(self::VERSION_LABEL, fn (string $label) => $node->setMetadataValue('label', $label));
+ $propPatch->handle(self::VERSION_LABEL, fn (string $label) => $node->setMetadataValue(self::LABEL, $label));
}
}
}
diff --git a/apps/files_versions/lib/Sabre/RootCollection.php b/apps/files_versions/lib/Sabre/RootCollection.php
index 8ed397069f7..1e7129f23da 100644
--- a/apps/files_versions/lib/Sabre/RootCollection.php
+++ b/apps/files_versions/lib/Sabre/RootCollection.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -16,33 +17,16 @@ use Sabre\DAVACL\PrincipalBackend;
class RootCollection extends AbstractPrincipalCollection {
- /** @var IRootFolder */
- private $rootFolder;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var IVersionManager */
- private $versionManager;
-
- /** @var IUserSession */
- private $userSession;
-
public function __construct(
PrincipalBackend\BackendInterface $principalBackend,
- IRootFolder $rootFolder,
+ private IRootFolder $rootFolder,
IConfig $config,
- IUserManager $userManager,
- IVersionManager $versionManager,
- IUserSession $userSession
+ private IUserManager $userManager,
+ private IVersionManager $versionManager,
+ private IUserSession $userSession,
) {
parent::__construct($principalBackend, 'principals/users');
- $this->rootFolder = $rootFolder;
- $this->userManager = $userManager;
- $this->versionManager = $versionManager;
- $this->userSession = $userSession;
-
$this->disableListing = !$config->getSystemValue('debug', false);
}
diff --git a/apps/files_versions/lib/Sabre/VersionCollection.php b/apps/files_versions/lib/Sabre/VersionCollection.php
index 57510b72ff6..375d5cf99f2 100644
--- a/apps/files_versions/lib/Sabre/VersionCollection.php
+++ b/apps/files_versions/lib/Sabre/VersionCollection.php
@@ -18,19 +18,11 @@ use Sabre\DAV\ICollection;
class VersionCollection implements ICollection {
- /** @var File */
- private $file;
-
- /** @var IUser */
- private $user;
-
- /** @var IVersionManager */
- private $versionManager;
-
- public function __construct(File $file, IUser $user, IVersionManager $versionManager) {
- $this->file = $file;
- $this->user = $user;
- $this->versionManager = $versionManager;
+ public function __construct(
+ private File $file,
+ private IUser $user,
+ private IVersionManager $versionManager,
+ ) {
}
public function createFile($name, $data = null) {
diff --git a/apps/files_versions/lib/Sabre/VersionFile.php b/apps/files_versions/lib/Sabre/VersionFile.php
index 55180a740a9..faa03473648 100644
--- a/apps/files_versions/lib/Sabre/VersionFile.php
+++ b/apps/files_versions/lib/Sabre/VersionFile.php
@@ -23,7 +23,7 @@ use Sabre\DAV\IFile;
class VersionFile implements IFile {
public function __construct(
private IVersion $version,
- private IVersionManager $versionManager
+ private IVersionManager $versionManager,
) {
}
@@ -75,7 +75,7 @@ class VersionFile implements IFile {
$backend = $this->version->getBackend();
if ($backend instanceof IMetadataVersionBackend) {
- $backend->setMetadataValue($this->version->getSourceFile(), $this->version->getRevisionId(), $key, $value);
+ $backend->setMetadataValue($this->version->getSourceFile(), $this->version->getTimestamp(), $key, $value);
return true;
} elseif ($key === 'label' && $backend instanceof INameableVersionBackend) {
$backend->setVersionLabel($this->version, $value);
diff --git a/apps/files_versions/lib/Sabre/VersionHome.php b/apps/files_versions/lib/Sabre/VersionHome.php
index d89291a8cf8..07ac491f2a1 100644
--- a/apps/files_versions/lib/Sabre/VersionHome.php
+++ b/apps/files_versions/lib/Sabre/VersionHome.php
@@ -1,4 +1,5 @@
<?php
+
/**
* SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
@@ -14,23 +15,12 @@ use Sabre\DAV\ICollection;
class VersionHome implements ICollection {
- /** @var array */
- private $principalInfo;
-
- /** @var IRootFolder */
- private $rootFolder;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var IVersionManager */
- private $versionManager;
-
- public function __construct(array $principalInfo, IRootFolder $rootFolder, IUserManager $userManager, IVersionManager $versionManager) {
- $this->principalInfo = $principalInfo;
- $this->rootFolder = $rootFolder;
- $this->userManager = $userManager;
- $this->versionManager = $versionManager;
+ public function __construct(
+ private array $principalInfo,
+ private IRootFolder $rootFolder,
+ private IUserManager $userManager,
+ private IVersionManager $versionManager,
+ ) {
}
private function getUser() {
diff --git a/apps/files_versions/lib/Sabre/VersionRoot.php b/apps/files_versions/lib/Sabre/VersionRoot.php
index 014f06069ab..7f7014fbee3 100644
--- a/apps/files_versions/lib/Sabre/VersionRoot.php
+++ b/apps/files_versions/lib/Sabre/VersionRoot.php
@@ -18,19 +18,11 @@ use Sabre\DAV\ICollection;
class VersionRoot implements ICollection {
- /** @var IUser */
- private $user;
-
- /** @var IRootFolder */
- private $rootFolder;
-
- /** @var IVersionManager */
- private $versionManager;
-
- public function __construct(IUser $user, IRootFolder $rootFolder, IVersionManager $versionManager) {
- $this->user = $user;
- $this->rootFolder = $rootFolder;
- $this->versionManager = $versionManager;
+ public function __construct(
+ private IUser $user,
+ private IRootFolder $rootFolder,
+ private IVersionManager $versionManager,
+ ) {
}
public function delete() {
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 01:23:21 +0000