From 2d74a755a8e02ae316377e4a4425136ddf925ebd Mon Sep 17 00:00:00 2001 From: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> Date: Fri, 31 Oct 2025 15:10:11 +0100 Subject: [PATCH] refactor(files_sharing): apply DRY in MountProvider Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com> --- apps/files_sharing/lib/MountProvider.php | 8 +++----- build/psalm-baseline.xml | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php index 0a6c80769b2..53a15c527c1 100644 --- a/apps/files_sharing/lib/MountProvider.php +++ b/apps/files_sharing/lib/MountProvider.php @@ -79,10 +79,8 @@ class MountProvider implements IMountProvider { $newMaxValidatedShare = $maxValidatedShare; foreach ($superShares as $share) { + [$parentShare, $groupedShares] = $share; try { - /** @var IShare $parentShare */ - $parentShare = $share[0]; - if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED && ($parentShare->getShareType() === IShare::TYPE_GROUP || $parentShare->getShareType() === IShare::TYPE_USERGROUP @@ -92,7 +90,7 @@ class MountProvider implements IMountProvider { $owner = $parentShare->getShareOwner(); if (!isset($ownerViews[$owner])) { - $ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files'); + $ownerViews[$owner] = new View('/' . $owner . '/files'); } $shareId = (int)$parentShare->getId(); $mount = new SharedMount( @@ -103,7 +101,7 @@ class MountProvider implements IMountProvider { // parent share 'superShare' => $parentShare, // children/component of the superShare - 'groupedShares' => $share[1], + 'groupedShares' => $groupedShares, 'ownerView' => $ownerViews[$owner], 'sharingDisabledForUser' => $sharingDisabledForUser ], diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index e7c7f278c0a..da97acda4e4 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1685,11 +1685,11 @@ - getShareOwner() . '/files')]]> + - getShareOwner() . '/files')]]> +