upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #32548 from nextcloud/fix/return-type

Browse source 
Fix return type and make type stricter
This commit is contained in:
Carl Schwan 2022-05-24 20:46:23 +02:00 committed by GitHub
commit d6158c8aea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php
View file

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
@ -115,30 +116,27 @@ class CommentPropertiesPlugin extends ServerPlugin {
return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId());
});
$propFind->handle(self::PROPERTY_NAME_HREF, function () use ($node) {
$propFind->handle(self::PROPERTY_NAME_HREF, function () use ($node): ?string {
return $this->getCommentsLink($node);
});
$propFind->handle(self::PROPERTY_NAME_UNREAD, function () use ($node): ?bool {
$propFind->handle(self::PROPERTY_NAME_UNREAD, function () use ($node): ?int {
return $this->cachedUnreadCount[$node->getId()] ?? $this->getUnreadCount($node);
});
}
/**
* Returns a reference to the comments node
*
* @return array|string|null
*/
public function getCommentsLink(Node $node) {
public function getCommentsLink(Node $node): ?string {
$href = $this->server->getBaseUri();
$entryPoint = strpos($href, '/remote.php/');
if ($entryPoint === false) {
// in case we end up somewhere else, unexpectedly.
return null;
}
$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
return $href;
$commentsPart = 'dav/comments/files/' . rawurldecode((string)$node->getId());
return substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
}
/**

5
build/psalm-baseline.xml
View file

@ -472,11 +472,6 @@
<code>tryTokenLogin</code>
</UndefinedInterfaceMethod>
</file>
<file src="apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php">
<InvalidScalarArgument occurrences="1">
<code>$node-&gt;getId()</code>
</InvalidScalarArgument>
</file>
<file src="apps/dav/lib/Connector/Sabre/Directory.php">
<InvalidPropertyAssignmentValue occurrences="1">
<code>$nodes</code>