Fix cross-device warning in rename function (#978)

This commit is contained in:
Marc 2025-11-30 16:08:09 +01:00 committed by GitHub
commit 6b3b841c0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -660,11 +660,19 @@ class FileSystem
$source = self::convertPath($source);
$dest = self::convertPath($dest);
// Try rename first (fast, atomic)
if (@rename($source, $dest)) {
return;
// Check if source and dest are on the same device to avoid cross-device rename errors
$source_stat = @stat($source);
$dest_parent = dirname($dest);
$dest_stat = @stat($dest_parent);
// Only use rename if on same device
if ($source_stat !== false && $dest_stat !== false && $source_stat['dev'] === $dest_stat['dev']) {
if (@rename($source, $dest)) {
return;
}
}
// Fall back to copy + delete for cross-device moves or if rename failed
if (is_dir($source)) {
self::copyDir($source, $dest);
self::removeDir($source);