Merge pull request #47837 from nextcloud/fix/files/dav-etag

nextcloud · Sep 9, 2024 · 0f73219 · 0f73219
2 parents 1fa674d + 70fa51f
commit 0f73219
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -391,7 +391,7 @@ public function getOwner($path) {
 	 * get the ETag for a file or folder
 	 *
 	 * @param string $path
-	 * @return string
+	 * @return string|false
 	 */
 	public function getETag($path) {
 		return uniqid();

diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
@@ -721,10 +721,9 @@ public function getPermissions($path) {
 		return $stat ? $stat['permissions'] : 0;
 	}
 
-	/** {@inheritdoc} */
 	public function getETag($path) {
 		$meta = $this->getMetaData($path);
-		return $meta ? $meta['etag'] : null;
+		return $meta ? $meta['etag'] : false;
 	}
 
 	/**

diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
@@ -513,17 +513,11 @@ public function isLocal() {
 		return true;
 	}
 
-	/**
-	 * get the ETag for a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
 	public function getETag($path) {
 		return $this->calculateEtag($path, $this->stat($path));
 	}
 
-	private function calculateEtag(string $path, array $stat): string {
+	private function calculateEtag(string $path, array $stat): string|false {
 		if ($stat['mode'] & 0x4000 && !($stat['mode'] & 0x8000)) { // is_dir & not socket
 			return parent::getETag($path);
 		} else {