Skip to content

fix: catch new type error being thrown #41504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeepDiver1975 merged 1 commit into from
Mar 17, 2026
+11 −1
Merged

fix: catch new type error being thrown #41504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion apps/files_trashbin/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,17 @@ public function retainKeys($filename, $owner, $ownerPath, $timestamp, $sourceSto
if ($sourceStorage !== null) {
$sourcePath = '/' . $owner . '/files_trashbin/files/'. $filename . '.d' . $timestamp;
$targetPath = '/' . $owner . '/files/' . $ownerPath;
return $sourceStorage->copyKeys($sourcePath, $targetPath);
try {
return $sourceStorage->copyKeys($sourcePath, $targetPath);
} catch (\TypeError $e) {
// FIXME: The copyKeys method isn't fully implemented in all the storages / wrappers.
// The call will likely trigger this error if the OC\Files\Storage\Wrapper\Encryption
// isn't part if the wrappers in the $sourceStorage.
// In PHP 7.4, this error was ignored and logged, but in PHP 8.3 it throws an
// exception that breaks the code execution.
// For the short term, we'll keep the previous behavior and catch the exception here.
return false;
}
}
}
return false;
Expand Down
Loading