fix(FileInfo): Ensure getChecksum doesn't return null

Same for getETag

Signed-off-by: Carl Schwan <[email protected]>

Author: CarlSchwan

apps/dav/lib/Connector/Sabre/File.php

@@ -362,7 +362,7 @@ public function put($data) {
 			if ($checksumHeader) {
 				$checksum = trim($checksumHeader);
 				$this->setChecksum($checksum);
-			} elseif ($this->getChecksum() !== null && $this->getChecksum() !== '') {
+			} elseif ($this->getChecksum() !== '') {
 				$this->setChecksum('');
 			}
 		} catch (StorageNotAvailableException $e) {
@@ -599,10 +599,8 @@ private function convertToSabreException(\Exception $e) {
 
 	/**
 	 * Get the checksum for this file
-	 *
-	 * @return string|null
 	 */
-	public function getChecksum() {
+	public function getChecksum(): string {
 		return $this->info->getChecksum();
 	}
 

apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -276,7 +276,7 @@ public function httpGet(RequestInterface $request, ResponseInterface $response)
 		if ($node instanceof File) {
 			//Add OC-Checksum header
 			$checksum = $node->getChecksum();
-			if ($checksum !== null && $checksum !== '') {
+			if ($checksum !== '') {
 				$response->addHeader('OC-Checksum', $checksum);
 			}
 		}
@@ -487,7 +487,7 @@ public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node)
 
 			$propFind->handle(self::CHECKSUMS_PROPERTYNAME, function () use ($node) {
 				$checksum = $node->getChecksum();
-				if ($checksum === null || $checksum === '') {
+				if ($checksum === '') {
 					return null;
 				}
 

lib/private/Files/FileInfo.php

@@ -117,7 +117,7 @@ public function getEtag(): string {
 			$combinedEtag = $this->data['etag'] . '::' . implode('::', $this->childEtags);
 			return md5($combinedEtag);
 		} else {
-			return $this->data['etag'];
+			return $this->data['etag'] ?? '';
 		}
 	}
 
@@ -283,7 +283,7 @@ public function addSubEntry(array|ICacheEntry|false $data, string $entryPath): v
 
 	#[Override]
 	public function getChecksum(): string {
-		return $this->data['checksum'];
+		return $this->data['checksum'] ?? '';
 	}
 
 	#[Override]

lib/public/Files/FileInfo.php

@@ -255,6 +255,8 @@ public function getOwner(): ?IUser;
 	 * Checksums are stored in the format TYPE:CHECKSUM, here may be multiple checksums separated by a single space
 	 * e.g. MD5:d3b07384d113edec49eaa6238ad5ff00 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
 	 *
+	 * @note This will return an empty string if no checksum is currently stored.
+	 *
 	 * @since 9.0.0
 	 */
 	public function getChecksum(): string;