Merge remote-tracking branch 'origin/backport/52880/stable31' into backport/52880/stable31

Author: yemkareems

apps/files_sharing/src/files_actions/rejectShareAction.ts

@@ -41,10 +41,20 @@ export const action = new FileAction({
 	async exec(node: Node) {
 		try {
 			const isRemote = !!node.attributes.remote
-			const url = generateOcsUrl('apps/files_sharing/api/v1/{shareBase}/{id}', {
-				shareBase: isRemote ? 'remote_shares' : 'shares',
-				id: node.attributes.id,
-			})
+			const shareBase = isRemote ? 'remote_shares' : 'shares'
+			const id = node.attributes.id
+			let url: string
+			if (node.attributes.accepted === 0) {
+				url = generateOcsUrl('apps/files_sharing/api/v1/{shareBase}/pending/{id}', {
+					shareBase,
+					id,
+				})
+			} else {
+				url = generateOcsUrl('apps/files_sharing/api/v1/{shareBase}/{id}', {
+					shareBase,
+					id,
+				})
+			}
 			await axios.delete(url)
 
 			// Remove from current view

dist/files_sharing-init.js

@@ -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);
 				}
 			}

dist/files_sharing-init.js.map

@@ -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');