fix: Update children classes of Common to respect copy signature

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Feb 22, 2024 · 4e44aaa · 4e44aaa
1 parent 679f1d6
commit 4e44aaa
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -573,7 +573,7 @@ public function touch($path, $mtime = null) {
 		return true;
 	}
 
-	public function copy($source, $target, $isFile = null) {
+	public function copy($source, $target, bool $preserveMtime = false, ?bool $isFile = null): bool {
 		$source = $this->normalizePath($source);
 		$target = $this->normalizePath($target);
 
@@ -607,7 +607,7 @@ public function copy($source, $target, $isFile = null) {
 			foreach ($this->getDirectoryContent($source) as $item) {
 				$childSource = $source . '/' . $item['name'];
 				$childTarget = $target . '/' . $item['name'];
-				$this->copy($childSource, $childTarget, $item['mimetype'] !== FileInfo::MIMETYPE_FOLDER);
+				$this->copy($childSource, $childTarget, $preserveMtime, $item['mimetype'] !== FileInfo::MIMETYPE_FOLDER);
 			}
 		}
 

diff --git a/apps/files_external/lib/Lib/Storage/SFTP.php b/apps/files_external/lib/Lib/Storage/SFTP.php
@@ -519,9 +519,9 @@ public function writeStream(string $path, $stream, int $size = null): int {
 		}
 	}
 
-	public function copy($source, $target) {
+	public function copy($source, $target, bool $preserveMtime = false): bool {
 		if ($this->is_dir($source) || $this->is_dir($target)) {
-			return parent::copy($source, $target);
+			return parent::copy($source, $target, $preserveMtime);
 		} else {
 			$absSource = $this->absPath($source);
 			$absTarget = $this->absPath($target);

diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
@@ -483,7 +483,7 @@ public function touch($path, $mtime = null) {
 		}
 	}
 
-	public function copy($source, $target) {
+	public function copy($source, $target, bool $preserveMtime = false): bool {
 		$source = $this->normalizePath($source);
 		$target = $this->normalizePath($target);
 
@@ -502,6 +502,12 @@ public function copy($source, $target) {
 				// invalidate target object to force repopulation on fetch
 				$this->objectCache->remove($target);
 				$this->objectCache->remove($target . '/');
+				if ($preserveMtime) {
+					$mTime = $this->filemtime($source);
+					if (is_int($mTime)) {
+						$this->touch($target, $mTime);
+					}
+				}
 			} catch (BadResponseError $e) {
 				\OC::$server->get(LoggerInterface::class)->error($e->getMessage(), [
 					'exception' => $e,
@@ -534,7 +540,7 @@ public function copy($source, $target) {
 
 				$source = $source . '/' . $file;
 				$target = $target . '/' . $file;
-				$this->copy($source, $target);
+				$this->copy($source, $target, $preserveMtime);
 			}
 		} else {
 			//file does not exist

diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -596,7 +596,7 @@ public function copyFromStorage(
 		$sourceInternalPath,
 		$targetInternalPath,
 		$preserveMtime = false
-	) {
+	): bool {
 		if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
 			/** @var ObjectStoreStorage $sourceStorage */
 			if ($sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
@@ -614,10 +614,10 @@ public function copyFromStorage(
 			}
 		}
 
-		return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+		return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime);
 	}
 
-	public function copy($source, $target) {
+	public function copy($source, $target, bool $preserveMtime = false): bool {
 		$source = $this->normalizePath($source);
 		$target = $this->normalizePath($target);
 

diff --git a/lib/private/Lockdown/Filesystem/NullStorage.php b/lib/private/Lockdown/Filesystem/NullStorage.php
@@ -117,7 +117,7 @@ public function rename($source, $target) {
 		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
 	}
 
-	public function copy($source, $target) {
+	public function copy($source, $target, bool $preserveMtime = false): bool {
 		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
 	}
 
@@ -161,7 +161,7 @@ public function getDirectDownload($path) {
 		return false;
 	}
 
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, bool $preserveMtime = false): bool {
 		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
 	}