Skip to content

Commit a0b6834

Browse files
committed
fix: use array_unitersect against objects
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
1 parent 27f6f86 commit a0b6834

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use OC\Files\View;
3131
use OCP\App\IAppManager;
3232
use OCP\Files\Folder;
33+
use OCP\Files\Node as INode;
3334
use OCP\IGroupManager;
3435
use OCP\ITagManager;
3536
use OCP\IUserSession;
@@ -238,7 +239,9 @@ public function onReport($reportName, $report, $uri) {
238239
// find sabre nodes by file id, restricted to the root node path
239240
$additionalNodes = $this->findNodesByFileIds($reportTargetNode, $resultFileIds);
240241
if ($additionalNodes && $results) {
241-
$results = array_intersect($results, $additionalNodes);
242+
$results = array_uintersect($results, $additionalNodes, function (Node $a, Node $b): int {
243+
return $a->getId() - $b->getId();
244+
});
242245
} elseif (!$results && $additionalNodes) {
243246
$results = $additionalNodes;
244247
}
@@ -344,7 +347,7 @@ protected function processFilterRulesForFileNodes(array $filterRules, ?int $limi
344347
if (count($nodes) === 0) {
345348
$nodes = $tmpNodes;
346349
} else {
347-
$nodes = array_uintersect($nodes, $tmpNodes, function (\OCP\Files\Node $a, \OCP\Files\Node $b): int {
350+
$nodes = array_uintersect($nodes, $tmpNodes, function (INode $a, INode $b): int {
348351
return $a->getId() - $b->getId();
349352
});
350353
}

0 commit comments

Comments
 (0)