nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

fix(psalm): update baseline and suppress unnecessary issues 

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ 2023-12-29 10:16:08 +01:00
parent 18399fc1cf
commit 9e4c9b97dd
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/dav/appinfo/v2/publicremote.php
View File

@ -109,13 +109,20 @@ $server = $serverFactory->createServer($baseuri, $requestUri, $authPlugin, funct
$fileId = $share->getNodeId();
// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
/** @psalm-suppress InternalMethod */
$previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);
/** @psalm-suppress MissingClosureParamType */
Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]);
});
/** @psalm-suppress MissingClosureParamType */
Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
});
/** @psalm-suppress InternalMethod */
Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
OC_Util::tearDownFS();

6
build/psalm-baseline.xml
View File

@ -105,12 +105,6 @@
<code>$baseuri</code>
</UndefinedGlobalVariable>
</file>
<file src="apps/dav/appinfo/v2/publicremote.php">
<InternalMethod>
<code>Filesystem::logWarningWhenAddingStorageWrapper($previousLog)</code>
<code>Filesystem::logWarningWhenAddingStorageWrapper(false)</code>
</InternalMethod>
</file>
<file src="apps/dav/lib/AppInfo/Application.php">
<InvalidArgument>
<code>CalendarDeletionDefaultUpdaterListener::class</code>

4
public.php
View File

@ -36,7 +36,7 @@ require_once __DIR__ . '/lib/versioncheck.php';
* @param $service
* @return string
*/
function resolveService($service) {
function resolveService(string $service): string {
$services = [
'webdav' => 'dav/appinfo/v1/publicwebdav.php',
'dav' => 'dav/appinfo/v2/publicremote.php',
@ -74,7 +74,7 @@ try {
$file = resolveService($service);
if (is_null($file)) {
if (!$file) {
throw new RemoteException('Path not found', 404);
}