utf8 check

Author: PierreLebedel

src/Fields/AgentField.php

@@ -36,7 +36,7 @@ public function relevantRender(): mixed
     public function __toString(): string
     {
         if (! $this->agentVCard) {
-            return null;
+            return '';
         }
 
         $agentVCardArray = explode(PHP_EOL, (string) $this->agentVCard);

src/Models/AbstractVCard.php

@@ -14,6 +14,8 @@
 
 abstract class AbstractVCard
 {
+    public const RFC_LINE_BREAK = "\r\n";
+
     public string $version;
 
     public stdClass $relevantData;
@@ -418,19 +420,28 @@ public function getX(string $name, bool $multiple = false): mixed
 
     public function toString(): string
     {
-        $vCardString = 'BEGIN:VCARD'.PHP_EOL;
-        $vCardString .= 'VERSION:'.$this->version.PHP_EOL;
+        $lines = [
+            'BEGIN:VCARD',
+            'VERSION:'.$this->version,
+        ];
 
         foreach ($this->properties as $name => $property) {
             if ($name == 'version') {
                 continue;
             }
-            $vCardString .= (string) $property.PHP_EOL;
+
+            $propertyString = trim((string) $property);
+
+            if ($propertyString === '') {
+                continue;
+            }
+
+            $lines[] = $propertyString;
         }
 
-        $vCardString .= 'END:VCARD';
+        $lines[] = 'END:VCARD';
 
-        return $vCardString;
+        return implode(self::RFC_LINE_BREAK, $lines);
     }
 
     public function __toString(): string
@@ -441,7 +452,7 @@ public function __toString(): string
     public function export(string $filePath): void
     {
         try {
-            $fp = fopen($filePath, 'w');
+            $fp = fopen($filePath, 'wb');
             fwrite($fp, $this->toString());
             fclose($fp);
         } catch (Throwable $e) {

src/VCardBuilder.php

@@ -81,11 +81,11 @@ public function getVersion(): ?VCardVersionEnum
         $versionProperty = $this->version ?? $this->getProperty('version');
 
         if ($versionProperty) {
-            if($versionProperty instanceof VCardVersionEnum){
+            if ($versionProperty instanceof VCardVersionEnum) {
                 $versionEnum = $versionProperty;
-            }elseif (! empty($versionProperty->fields)) {
+            } elseif (! empty($versionProperty->fields)) {
                 $versionValue = reset($versionProperty->fields)->value;
-                
+
                 $versionEnum = VCardVersionEnum::tryFrom($versionValue);
             }
         }

src/VCardsCollection.php

@@ -56,12 +56,13 @@ public function first(): ?AbstractVCard
 
     public function toString(): string
     {
-        $collectionString = '';
+        $vCards = [];
+
         foreach ($this->vCards as $vCard) {
-            $collectionString .= (string) $vCard;
+            $vCards[] = $vCard->toString();
         }
 
-        return $collectionString;
+        return implode(AbstractVCard::RFC_LINE_BREAK, $vCards);
     }
 
     public function __toString(): string
@@ -74,11 +75,11 @@ public function export(string $filePath, bool $append = false): void
         try {
             $mode = ($append) ? 'a' : 'w';
 
-            $fp = fopen($filePath, $mode);
+            $fp = fopen($filePath, $mode.'b');
 
             if ($mode == 'a') {
-                if (filesize($filePath) > 0) {
-                    fwrite($fp, PHP_EOL);
+                if (file_exists($filePath) && filesize($filePath) > 0) {
+                    fwrite($fp, AbstractVCard::RFC_LINE_BREAK);
                 }
             }
 

tests/BuilderTest.php

@@ -41,3 +41,25 @@
     assertEquals('Jeffrey Lebowski', $vCard->getFullName());
     assertStringContainsString('EMAIL:jeff@example.com', (string) $vCard);
 });
+
+it('exports utf-8 vcards with windows-safe line endings', function () {
+    $path = sys_get_temp_dir().DIRECTORY_SEPARATOR.'vcardio-accented.vcf';
+
+    VCardBuilder::make()
+        ->version('3.0')
+        ->fullName('Élodie Brûlé')
+        ->name('Brûlé', 'Élodie')
+        ->organization('Société Générale')
+        ->export($path);
+
+    $raw = file_get_contents($path);
+
+    expect($raw)->not->toBeFalse();
+
+    expect(substr($raw, 0, 3))->not->toBe("\xEF\xBB\xBF");
+    assertStringContainsString("BEGIN:VCARD\r\nVERSION:3.0\r\n", $raw);
+    assertStringContainsString("FN:Élodie Brûlé\r\n", $raw);
+    assertStringContainsString("N:Brûlé;Élodie\r\n", $raw);
+    assertStringContainsString("ORG:Société Générale\r\n", $raw);
+    expect($raw)->toContain("\r\nEND:VCARD");
+});