From 507e6208cafa68f5477efcadbdfab9a69cb1b62b Mon Sep 17 00:00:00 2001 From: SebastianKrupinski Date: Fri, 5 Jun 2026 11:37:50 -0400 Subject: [PATCH] fix: use card interface instead of object Signed-off-by: SebastianKrupinski --- apps/dav/lib/CardDAV/HasPhotoPlugin.php | 4 ++-- apps/dav/lib/CardDAV/ImageExportPlugin.php | 4 ++-- apps/dav/lib/CardDAV/PhotoCache.php | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/dav/lib/CardDAV/HasPhotoPlugin.php b/apps/dav/lib/CardDAV/HasPhotoPlugin.php index 19c926dfcf605..0d35fd08001ab 100644 --- a/apps/dav/lib/CardDAV/HasPhotoPlugin.php +++ b/apps/dav/lib/CardDAV/HasPhotoPlugin.php @@ -9,7 +9,7 @@ namespace OCA\DAV\CardDAV; -use Sabre\CardDAV\Card; +use Sabre\CardDAV\ICard; use Sabre\DAV\INode; use Sabre\DAV\PropFind; use Sabre\DAV\Server; @@ -43,7 +43,7 @@ public function initialize(Server $server) { public function propFind(PropFind $propFind, INode $node) { $ns = '{http://nextcloud.com/ns}'; - if ($node instanceof Card) { + if ($node instanceof ICard) { $propFind->handle($ns . 'has-photo', function () use ($node) { $vcard = Reader::read($node->get()); return $vcard instanceof VCard diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php index 61bc6a8f7cb7d..9bc8db7567b3f 100644 --- a/apps/dav/lib/CardDAV/ImageExportPlugin.php +++ b/apps/dav/lib/CardDAV/ImageExportPlugin.php @@ -10,7 +10,7 @@ use OCP\AppFramework\Http; use OCP\Files\NotFoundException; -use Sabre\CardDAV\Card; +use Sabre\CardDAV\ICard; use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; use Sabre\HTTP\RequestInterface; @@ -64,7 +64,7 @@ public function httpGet(RequestInterface $request, ResponseInterface $response) $path = $request->getPath(); $node = $this->server->tree->getNodeForPath($path); - if (!$node instanceof Card) { + if (!$node instanceof ICard) { return true; } diff --git a/apps/dav/lib/CardDAV/PhotoCache.php b/apps/dav/lib/CardDAV/PhotoCache.php index 03c71f7e4a3fe..419ef5822d55f 100644 --- a/apps/dav/lib/CardDAV/PhotoCache.php +++ b/apps/dav/lib/CardDAV/PhotoCache.php @@ -15,7 +15,7 @@ use OCP\Files\SimpleFS\ISimpleFolder; use OCP\Image; use Psr\Log\LoggerInterface; -use Sabre\CardDAV\Card; +use Sabre\CardDAV\ICard; use Sabre\VObject\Document; use Sabre\VObject\Parameter; use Sabre\VObject\Property\Binary; @@ -43,7 +43,7 @@ public function __construct( /** * @throws NotFoundException */ - public function get(int $addressBookId, string $cardUri, int $size, Card $card): ISimpleFile { + public function get(int $addressBookId, string $cardUri, int $size, ICard $card): ISimpleFile { $folder = $this->getFolder($addressBookId, $cardUri); if ($this->isEmpty($folder)) { @@ -68,7 +68,7 @@ private function isEmpty(ISimpleFolder $folder): bool { /** * @throws NotPermittedException */ - private function init(ISimpleFolder $folder, Card $card): void { + private function init(ISimpleFolder $folder, ICard $card): void { $data = $this->getPhoto($card); if ($data === false || !isset($data['Content-Type'])) { @@ -168,10 +168,10 @@ private function getExtension(ISimpleFolder $folder): string { } /** - * @param Card $node + * @param ICard $node * @return false|array{body: string, Content-Type: string} */ - private function getPhoto(Card $node) { + private function getPhoto(ICard $node) { try { $vObject = $this->readCard($node->get()); return $this->getPhotoFromVObject($vObject);