From a268e5cf5b2e539a0cef5a324b9ca324ed24d7fd Mon Sep 17 00:00:00 2001 From: Louis Chmn Date: Tue, 3 Feb 2026 11:51:26 +0100 Subject: [PATCH] fix: Migrate `getById` to `getFirstNodeById` Signed-off-by: Louis Chmn --- lib/BackgroundJobs/FileSystemListenerJob.php | 2 +- lib/BackgroundJobs/IndexerJob.php | 2 +- lib/Listener/FileListener.php | 8 ++++---- lib/Service/FsEventService.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/BackgroundJobs/FileSystemListenerJob.php b/lib/BackgroundJobs/FileSystemListenerJob.php index 49efc1f..296fd18 100644 --- a/lib/BackgroundJobs/FileSystemListenerJob.php +++ b/lib/BackgroundJobs/FileSystemListenerJob.php @@ -84,7 +84,7 @@ protected function run($argument): void { } try { - $node = current($this->rootFolder->getUserFolder($fsEvent->getUserId())->getById($fsEvent->getNodeId())); + $node = $this->rootFolder->getUserFolder($fsEvent->getUserId())->getFirstNodeById($fsEvent->getNodeId()); } catch (\Exception $e) { $this->logger->warning('Error retrieving node for fs event' . $e->getMessage(), [ 'exception' => $e, diff --git a/lib/BackgroundJobs/IndexerJob.php b/lib/BackgroundJobs/IndexerJob.php index 8f23cd9..9a765fd 100644 --- a/lib/BackgroundJobs/IndexerJob.php +++ b/lib/BackgroundJobs/IndexerJob.php @@ -191,7 +191,7 @@ protected function index(array $files): void { // this includes files that are too large, locked, or not readable $visitedQFiles[] = $queueFile; - $file = current($this->rootFolder->getById($queueFile->getFileId())); + $file = $this->rootFolder->getFirstNodeById($queueFile->getFileId()); if (!$file instanceof File) { continue; } diff --git a/lib/Listener/FileListener.php b/lib/Listener/FileListener.php index 3d3e9d7..b4b08ca 100644 --- a/lib/Listener/FileListener.php +++ b/lib/Listener/FileListener.php @@ -78,8 +78,8 @@ public function handle(Event $event): void { } if ($event instanceof CacheEntryInsertedEvent) { - $node = current($this->rootFolder->getById($event->getFileId())); - if ($node === false) { + $node = $this->rootFolder->getFirstNodeById($event->getFileId()); + if ($node === null) { return; } if ($node instanceof Folder) { @@ -105,8 +105,8 @@ public function handle(Event $event): void { if ($cacheEntry === false) { return; } - $node = current($this->rootFolder->getById($cacheEntry->getId())); - if ($node === false) { + $node = $this->rootFolder->getFirstNodeById($cacheEntry->getId()); + if ($node === null) { return; } // Synchronous, because we wouldn't have the recursive list of file ids after deletion diff --git a/lib/Service/FsEventService.php b/lib/Service/FsEventService.php index d675b22..3bbec49 100644 --- a/lib/Service/FsEventService.php +++ b/lib/Service/FsEventService.php @@ -117,7 +117,7 @@ public function onInsert(Node $node, bool $recurse = true, bool $update = false) } foreach ($fileIds as $fileId) { - $file = current($this->rootFolder->getById($fileId)); + $file = $this->rootFolder->getFirstNodeById($fileId); if (!$file instanceof File) { continue; }