Merge pull request #54628 from nextcloud/backport/54607/stable31

[stable31] fix(encryption): Fix TypeError when trying to decrypt unencrypted file

Author: come-nc

lib/private/Files/Storage/Wrapper/Encryption.php

@@ -671,6 +671,8 @@ private function copyBetweenStorage(
 				}
 			}
 		} else {
+			$source = false;
+			$target = false;
 			try {
 				$source = $sourceStorage->fopen($sourceInternalPath, 'r');
 				$target = $this->fopen($targetInternalPath, 'w');
@@ -680,10 +682,10 @@ private function copyBetweenStorage(
 					[, $result] = \OC_Helper::streamCopy($source, $target);
 				}
 			} finally {
-				if (isset($source) && $source !== false) {
+				if ($source !== false) {
 					fclose($source);
 				}
-				if (isset($target) && $target !== false) {
+				if ($target !== false) {
 					fclose($target);
 				}
 			}

tests/lib/Files/ViewTest.php

@@ -1185,6 +1185,9 @@ private function doTestCopyRenameFail($operation) {
 		$storage2->method('writeStream')
 			->willThrowException(new GenericFileException('Failed to copy stream'));
 
+		$storage2->method('fopen')
+			->willReturn(false);
+
 		$storage1->mkdir('sub');
 		$storage1->file_put_contents('foo.txt', '0123456789ABCDEFGH');
 		$storage1->mkdir('dirtomove');