Skip to content

Commit 53c9edc

Browse files
committed
Output literal null string
Signed-off-by: Christopher Ng <chrng8@gmail.com>
1 parent d3505a2 commit 53c9edc

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

apps/dav/lib/UserMigration/ContactsMigrator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private function getAddressBookExportData(IUser $user, array $addressBookInfo, O
122122

123123
$problems = $vCard->validate();
124124
if (!empty($problems)) {
125-
$output->writeln('Skipping contact "' . ($vCard->FN ?? null) . '" containing invalid contact data');
125+
$output->writeln('Skipping contact "' . ($vCard->FN ?? 'null') . '" containing invalid contact data');
126126
continue;
127127
}
128128
$vCards[] = $vCard;
@@ -240,7 +240,7 @@ private function importContact(int $addressBookId, VCard $vCard, string $filenam
240240
$vCard->serialize(),
241241
);
242242
} catch (Throwable $e) {
243-
$output->writeln("Error creating contact \"" . ($vCard->FN ?? null) . "\" from \"$filename\", skipping…");
243+
$output->writeln("Error creating contact \"" . ($vCard->FN ?? 'null') . "\" from \"$filename\", skipping…");
244244
}
245245
}
246246

@@ -334,7 +334,7 @@ public function import(IUser $user, IImportSource $importSource, OutputInterface
334334
while ($vCard = $vCardSplitter->getNext()) {
335335
$problems = $vCard->validate();
336336
if (!empty($problems)) {
337-
$output->writeln('Skipping contact "' . ($vCard->FN ?? null) . '" containing invalid contact data');
337+
$output->writeln('Skipping contact "' . ($vCard->FN ?? 'null') . '" containing invalid contact data');
338338
continue;
339339
}
340340
$vCards[] = $vCard;

0 commit comments

Comments
 (0)