upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

refactor(files_sharing): apply DRY in MountProvider

Browse source 
Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com>
This commit is contained in:
Salvatore Martire 2025-10-31 15:10:11 +01:00
parent 111d9397ae
commit 2d74a755a8
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/files_sharing/lib/MountProvider.php
View file

@ -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
],

4
build/psalm-baseline.xml
View file

@ -1685,11 +1685,11 @@
</file>
<file src="apps/files_sharing/lib/MountProvider.php">
<InternalClass>
<code><![CDATA[new View('/' . $parentShare->getShareOwner() . '/files')]]></code>
<code><![CDATA[new View('/' . $owner . '/files')]]></code>
<code><![CDATA[new View('/' . $userId . '/files')]]></code>
</InternalClass>
<InternalMethod>
<code><![CDATA[new View('/' . $parentShare->getShareOwner() . '/files')]]></code>
<code><![CDATA[new View('/' . $owner . '/files')]]></code>
<code><![CDATA[new View('/' . $userId . '/files')]]></code>
</InternalMethod>
</file>