nextcloud / server

apps/dav/lib/Service/DefaultContactService.php

Indentation +51 added lines, -51 removed lines

@@ -18,60 +18,60 @@
 use Symfony\Component\Uid\Uuid;
 
 class DefaultContactService {
-	public function __construct(
-		private CardDavBackend $cardDav,
-		private IAppManager $appManager,
-		private IAppDataFactory $appDataFactory,
-		private IAppConfig $config,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private CardDavBackend $cardDav,
+        private IAppManager $appManager,
+        private IAppDataFactory $appDataFactory,
+        private IAppConfig $config,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function createDefaultContact(int $addressBookId): void {
-		$enableDefaultContact = $this->config->getValueString(Application::APP_ID, 'enableDefaultContact', 'no');
-		if ($enableDefaultContact !== 'yes') {
-			return;
-		}
-		$appData = $this->appDataFactory->get('dav');
-		try {
-			$folder = $appData->getFolder('defaultContact');
-			$defaultContactFile = $folder->getFile('defaultContact.vcf');
-			$data = $defaultContactFile->getContent();
-		} catch (\Exception $e) {
-			$this->logger->error('Couldn\'t get default contact file', ['exception' => $e]);
-			return;
-		}
+    public function createDefaultContact(int $addressBookId): void {
+        $enableDefaultContact = $this->config->getValueString(Application::APP_ID, 'enableDefaultContact', 'no');
+        if ($enableDefaultContact !== 'yes') {
+            return;
+        }
+        $appData = $this->appDataFactory->get('dav');
+        try {
+            $folder = $appData->getFolder('defaultContact');
+            $defaultContactFile = $folder->getFile('defaultContact.vcf');
+            $data = $defaultContactFile->getContent();
+        } catch (\Exception $e) {
+            $this->logger->error('Couldn\'t get default contact file', ['exception' => $e]);
+            return;
+        }
 
-		// Make sure the UID is unique
-		$newUid = Uuid::v4()->toRfc4122();
-		$newRev = date('Ymd\THis\Z');
-		$vcard = \Sabre\VObject\Reader::read($data, \Sabre\VObject\Reader::OPTION_FORGIVING);
-		if ($vcard->UID) {
-			$vcard->UID->setValue($newUid);
-		} else {
-			$vcard->add('UID', $newUid);
-		}
-		if ($vcard->REV) {
-			$vcard->REV->setValue($newRev);
-		} else {
-			$vcard->add('REV', $newRev);
-		}
+        // Make sure the UID is unique
+        $newUid = Uuid::v4()->toRfc4122();
+        $newRev = date('Ymd\THis\Z');
+        $vcard = \Sabre\VObject\Reader::read($data, \Sabre\VObject\Reader::OPTION_FORGIVING);
+        if ($vcard->UID) {
+            $vcard->UID->setValue($newUid);
+        } else {
+            $vcard->add('UID', $newUid);
+        }
+        if ($vcard->REV) {
+            $vcard->REV->setValue($newRev);
+        } else {
+            $vcard->add('REV', $newRev);
+        }
 
-		// Level 3 means that the document is invalid
-		// https://sabre.io/vobject/vcard/#validating-vcard
-		$level3Warnings = array_filter($vcard->validate(), function ($warning) {
-			return  $warning['level'] === 3;
-		});
+        // Level 3 means that the document is invalid
+        // https://sabre.io/vobject/vcard/#validating-vcard
+        $level3Warnings = array_filter($vcard->validate(), function ($warning) {
+            return  $warning['level'] === 3;
+        });
 
-		if (!empty($level3Warnings)) {
-			$this->logger->error('Default contact is invalid', ['warnings' => $level3Warnings]);
-			return;
-		}
-		try {
-			$this->cardDav->createCard($addressBookId, 'default', $vcard->serialize(), false);
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
-		}
+        if (!empty($level3Warnings)) {
+            $this->logger->error('Default contact is invalid', ['warnings' => $level3Warnings]);
+            return;
+        }
+        try {
+            $this->cardDav->createCard($addressBookId, 'default', $vcard->serialize(), false);
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e]);
+        }
 
-	}
+    }
 }

apps/dav/tests/unit/Service/DefaultContactServiceTest.php

Indentation +135 added lines, -135 removed lines

@@ -24,142 +24,142 @@
 use Test\TestCase;
 
 class DefaultContactServiceTest extends TestCase {
-	private DefaultContactService $service;
-	private MockObject|CardDavBackend $cardDav;
-	private MockObject|IAppManager $appManager;
-	private MockObject|IAppDataFactory $appDataFactory;
-	private MockObject|LoggerInterface $logger;
-	private MockObject|IAppConfig $config;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->cardDav = $this->createMock(CardDavBackend::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->appDataFactory = $this->createMock(IAppDataFactory::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->config = $this->createMock(IAppConfig::class);
-
-		$this->service = new DefaultContactService(
-			$this->cardDav,
-			$this->appManager,
-			$this->appDataFactory,
-			$this->config,
-			$this->logger,
-		);
-	}
-
-	public function testCreateDefaultContactWithInvalidCard(): void {
-		// Invalid vCard missing required FN property
-		$vcardContent = "BEGIN:VCARD\nVERSION:3.0\nEND:VCARD";
-		$this->config->method('getValueString')->willReturn('yes');
-		$appData = $this->createMock(IAppData::class);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getContent')->willReturn($vcardContent);
-		$folder->method('getFile')->willReturn($file);
-		$appData->method('getFolder')->willReturn($folder);
-		$this->appDataFactory->method('get')->willReturn($appData);
-
-		$this->logger->expects($this->once())
-			->method('error')
-			->with('Default contact is invalid', $this->anything());
-
-		$this->cardDav->expects($this->never())
-			->method('createCard');
-
-		$this->service->createDefaultContact(123);
-	}
-
-	public function testUidAndRevAreUpdated(): void {
-		$originalUid = 'original-uid';
-		$originalRev = '20200101T000000Z';
-		$vcardContent = "BEGIN:VCARD\nVERSION:3.0\nFN:Test User\nUID:$originalUid\nREV:$originalRev\nEND:VCARD";
-
-		$this->config->method('getValueString')->willReturn('yes');
-		$appData = $this->createMock(IAppData::class);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getContent')->willReturn($vcardContent);
-		$folder->method('getFile')->willReturn($file);
-		$appData->method('getFolder')->willReturn($folder);
-		$this->appDataFactory->method('get')->willReturn($appData);
+    private DefaultContactService $service;
+    private MockObject|CardDavBackend $cardDav;
+    private MockObject|IAppManager $appManager;
+    private MockObject|IAppDataFactory $appDataFactory;
+    private MockObject|LoggerInterface $logger;
+    private MockObject|IAppConfig $config;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->cardDav = $this->createMock(CardDavBackend::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->appDataFactory = $this->createMock(IAppDataFactory::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->config = $this->createMock(IAppConfig::class);
+
+        $this->service = new DefaultContactService(
+            $this->cardDav,
+            $this->appManager,
+            $this->appDataFactory,
+            $this->config,
+            $this->logger,
+        );
+    }
+
+    public function testCreateDefaultContactWithInvalidCard(): void {
+        // Invalid vCard missing required FN property
+        $vcardContent = "BEGIN:VCARD\nVERSION:3.0\nEND:VCARD";
+        $this->config->method('getValueString')->willReturn('yes');
+        $appData = $this->createMock(IAppData::class);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getContent')->willReturn($vcardContent);
+        $folder->method('getFile')->willReturn($file);
+        $appData->method('getFolder')->willReturn($folder);
+        $this->appDataFactory->method('get')->willReturn($appData);
+
+        $this->logger->expects($this->once())
+            ->method('error')
+            ->with('Default contact is invalid', $this->anything());
+
+        $this->cardDav->expects($this->never())
+            ->method('createCard');
+
+        $this->service->createDefaultContact(123);
+    }
+
+    public function testUidAndRevAreUpdated(): void {
+        $originalUid = 'original-uid';
+        $originalRev = '20200101T000000Z';
+        $vcardContent = "BEGIN:VCARD\nVERSION:3.0\nFN:Test User\nUID:$originalUid\nREV:$originalRev\nEND:VCARD";
+
+        $this->config->method('getValueString')->willReturn('yes');
+        $appData = $this->createMock(IAppData::class);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getContent')->willReturn($vcardContent);
+        $folder->method('getFile')->willReturn($file);
+        $appData->method('getFolder')->willReturn($folder);
+        $this->appDataFactory->method('get')->willReturn($appData);
 		
-		$capturedCardData = null;
-		$this->cardDav->expects($this->once())
-			->method('createCard')
-			->with(
-				$this->anything(),
-				$this->anything(),
-				$this->callback(function ($cardData) use (&$capturedCardData) {
-					$capturedCardData = $cardData;
-					return true;
-				}),
-				$this->anything()
-			)->willReturn(null);
+        $capturedCardData = null;
+        $this->cardDav->expects($this->once())
+            ->method('createCard')
+            ->with(
+                $this->anything(),
+                $this->anything(),
+                $this->callback(function ($cardData) use (&$capturedCardData) {
+                    $capturedCardData = $cardData;
+                    return true;
+                }),
+                $this->anything()
+            )->willReturn(null);
 		
-		$this->service->createDefaultContact(123);
+        $this->service->createDefaultContact(123);
 		
-		$vcard = \Sabre\VObject\Reader::read($capturedCardData);
-		$this->assertNotEquals($originalUid, $vcard->UID->getValue());
-		$this->assertTrue(Uuid::isValid($vcard->UID->getValue()));
-		$this->assertNotEquals($originalRev, $vcard->REV->getValue());
-	}
-
-	public function testDefaultContactFileDoesNotExist(): void {
-		$appData = $this->createMock(IAppData::class);
-		$this->config->method('getValueString')->willReturn('yes');
-		$appData->method('getFolder')->willThrowException(new NotFoundException());
-		$this->appDataFactory->method('get')->willReturn($appData);
-
-		$this->cardDav->expects($this->never())
-			->method('createCard');
-
-		$this->service->createDefaultContact(123);
-	}
-
-	public function testUidAndRevAreAddedIfMissing(): void {
-		$vcardContent = "BEGIN:VCARD\nVERSION:3.0\nFN:Test User\nEND:VCARD";
-
-		$this->config->method('getValueString')->willReturn('yes');
-		$appData = $this->createMock(IAppData::class);
-		$folder = $this->createMock(ISimpleFolder::class);
-		$file = $this->createMock(ISimpleFile::class);
-		$file->method('getContent')->willReturn($vcardContent);
-		$folder->method('getFile')->willReturn($file);
-		$appData->method('getFolder')->willReturn($folder);
-		$this->appDataFactory->method('get')->willReturn($appData);
-
-		$capturedCardData = 'new-card-data';
-
-		$this->cardDav
-			->expects($this->once())
-			->method('createCard')
-			->with(
-				$this->anything(),
-				$this->anything(),
-				$this->callback(function ($cardData) use (&$capturedCardData) {
-					$capturedCardData = $cardData;
-					return true;
-				}),
-				$this->anything()
-			);
-
-		$this->service->createDefaultContact(123);
-		$vcard = \Sabre\VObject\Reader::read($capturedCardData);
-
-		$this->assertNotNull($vcard->REV);
-		$this->assertNotNull($vcard->UID);
-		$this->assertTrue(Uuid::isValid($vcard->UID->getValue()));
-	}
-
-	public function testDefaultContactIsNotCreatedIfEnabled(): void {
-		$this->config->method('getValueString')->willReturn('no');
-		$this->logger->expects($this->never())
-			->method('error');
-		$this->cardDav->expects($this->never())
-			->method('createCard');
-
-		$this->service->createDefaultContact(123);
-	}
+        $vcard = \Sabre\VObject\Reader::read($capturedCardData);
+        $this->assertNotEquals($originalUid, $vcard->UID->getValue());
+        $this->assertTrue(Uuid::isValid($vcard->UID->getValue()));
+        $this->assertNotEquals($originalRev, $vcard->REV->getValue());
+    }
+
+    public function testDefaultContactFileDoesNotExist(): void {
+        $appData = $this->createMock(IAppData::class);
+        $this->config->method('getValueString')->willReturn('yes');
+        $appData->method('getFolder')->willThrowException(new NotFoundException());
+        $this->appDataFactory->method('get')->willReturn($appData);
+
+        $this->cardDav->expects($this->never())
+            ->method('createCard');
+
+        $this->service->createDefaultContact(123);
+    }
+
+    public function testUidAndRevAreAddedIfMissing(): void {
+        $vcardContent = "BEGIN:VCARD\nVERSION:3.0\nFN:Test User\nEND:VCARD";
+
+        $this->config->method('getValueString')->willReturn('yes');
+        $appData = $this->createMock(IAppData::class);
+        $folder = $this->createMock(ISimpleFolder::class);
+        $file = $this->createMock(ISimpleFile::class);
+        $file->method('getContent')->willReturn($vcardContent);
+        $folder->method('getFile')->willReturn($file);
+        $appData->method('getFolder')->willReturn($folder);
+        $this->appDataFactory->method('get')->willReturn($appData);
+
+        $capturedCardData = 'new-card-data';
+
+        $this->cardDav
+            ->expects($this->once())
+            ->method('createCard')
+            ->with(
+                $this->anything(),
+                $this->anything(),
+                $this->callback(function ($cardData) use (&$capturedCardData) {
+                    $capturedCardData = $cardData;
+                    return true;
+                }),
+                $this->anything()
+            );
+
+        $this->service->createDefaultContact(123);
+        $vcard = \Sabre\VObject\Reader::read($capturedCardData);
+
+        $this->assertNotNull($vcard->REV);
+        $this->assertNotNull($vcard->UID);
+        $this->assertTrue(Uuid::isValid($vcard->UID->getValue()));
+    }
+
+    public function testDefaultContactIsNotCreatedIfEnabled(): void {
+        $this->config->method('getValueString')->willReturn('no');
+        $this->logger->expects($this->never())
+            ->method('error');
+        $this->cardDav->expects($this->never())
+            ->method('createCard');
+
+        $this->service->createDefaultContact(123);
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@ 
 
 class DefaultContactServiceTest extends TestCase {
 	private DefaultContactService $service;
-	private MockObject|CardDavBackend $cardDav;
-	private MockObject|IAppManager $appManager;
-	private MockObject|IAppDataFactory $appDataFactory;
-	private MockObject|LoggerInterface $logger;
-	private MockObject|IAppConfig $config;
+	private MockObject | CardDavBackend $cardDav;
+	private MockObject | IAppManager $appManager;
+	private MockObject | IAppDataFactory $appDataFactory;
+	private MockObject | LoggerInterface $logger;
+	private MockObject | IAppConfig $config;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -91,7 +91,7 @@ 
 			->with(
 				$this->anything(),
 				$this->anything(),
-				$this->callback(function ($cardData) use (&$capturedCardData) {
+				$this->callback(function($cardData) use (&$capturedCardData) {
 					$capturedCardData = $cardData;
 					return true;
 				}),
@@ -138,7 +138,7 @@ 
 			->with(
 				$this->anything(),
 				$this->anything(),
-				$this->callback(function ($cardData) use (&$capturedCardData) {
+				$this->callback(function($cardData) use (&$capturedCardData) {
 					$capturedCardData = $cardData;
 					return true;
 				}),