From 855152110f4fc9bd795188360e0b71a2ba15c7ca Mon Sep 17 00:00:00 2001 From: Benjamin Gaussorgues Date: Tue, 9 Sep 2025 10:51:37 +0200 Subject: [PATCH] perf(mounts): avoid array_merge in mounts loop Signed-off-by: Benjamin Gaussorgues --- apps/files_sharing/lib/MountProvider.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php index b7b0582493e..349aa1cae88 100644 --- a/apps/files_sharing/lib/MountProvider.php +++ b/apps/files_sharing/lib/MountProvider.php @@ -62,7 +62,7 @@ class MountProvider implements IMountProvider { $superShares = $this->buildSuperShares($shares, $user); - $otherMounts = $this->mountManager->getAll(); + $allMounts = $this->mountManager->getAll(); $mounts = []; $view = new View('/' . $user->getUID() . '/files'); $ownerViews = []; @@ -93,7 +93,7 @@ class MountProvider implements IMountProvider { $shareId = (int)$parentShare->getId(); $mount = new SharedMount( '\OCA\Files_Sharing\SharedStorage', - array_merge($mounts, $otherMounts), + $allMounts, [ 'user' => $user->getUID(), // parent share @@ -116,9 +116,9 @@ class MountProvider implements IMountProvider { $event = new ShareMountedEvent($mount); $this->eventDispatcher->dispatchTyped($event); - $mounts[$mount->getMountPoint()] = $mount; + $mounts[$mount->getMountPoint()] = $allMounts[$mount->getMountPoint()] = $mount; foreach ($event->getAdditionalMounts() as $additionalMount) { - $mounts[$additionalMount->getMountPoint()] = $additionalMount; + $allMounts[$additionalMount->getMountPoint()] = $mounts[$additionalMount->getMountPoint()] = $additionalMount; } } catch (\Exception $e) { $this->logger->error(