Skip to content

Commit 9bb9f01

Browse files
committed
fix: PHP 7.4 compatibility
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
1 parent 33b9ba5 commit 9bb9f01

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

apps/dav/lib/Connector/Sabre/FilesReportPlugin.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,11 @@ public function findNodesByFileIds(Node $rootNode, array $fileIds): array {
442442
return $results;
443443
}
444444

445-
protected function wrapNode(\OCP\Files\File|\OCP\Files\Folder $node): File|Directory {
445+
/**
446+
* @param \OCP\Files\File|\OCP\Files\Folder $node
447+
* @return File|Directory
448+
*/
449+
protected function wrapNode($node): \OCA\DAV\Connector\Sabre\Node {
446450
if ($node instanceof \OCP\Files\File) {
447451
return new File($this->fileView, $node);
448452
} else {

apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ class FilesReportPluginTest extends \Test\TestCase {
6666
/** @var ITags|MockObject */
6767
private $privateTags;
6868

69-
private ITagManager|MockObject $privateTagManager;
69+
/** @var ITagManager|MockObject|(object&MockObject)|(ITagManager&object&MockObject)|(ITagManager&MockObject) */
70+
private $privateTagManager;
7071

7172
/** @var \OCP\IUserSession */
7273
private $userSession;

lib/private/Files/Cache/QuerySearchHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function __construct(
6464
LoggerInterface $logger,
6565
SearchBuilder $searchBuilder,
6666
QueryOptimizer $queryOptimizer,
67-
IGroupManager $groupManager,
67+
IGroupManager $groupManager
6868
) {
6969
$this->mimetypeLoader = $mimetypeLoader;
7070
$this->connection = $connection;

0 commit comments

Comments
 (0)