Added VCard without FN fallback (sabre-io#384)

* Added VCard without FN fallback see nextcloud/contacts#206 * Added tests for VCard with EMAIL fallback * Fixed broken test
armetiz · Jun 2, 2020 · 345a04c · 345a04c
1 parent 8b1c10f
commit 345a04c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
@@ -295,6 +295,11 @@ function validate($options = 0) {
                 } elseif (isset($this->ORG)) {
                     $this->FN = (string)$this->ORG;
                     $repaired = true;
+
+                // Otherwise, the EMAIL property may work
+                } elseif (isset($this->EMAIL)) {
+                    $this->FN = (string)$this->EMAIL;
+                    $repaired = true;
                 }
 
             }

diff --git a/tests/VObject/Component/VCardTest.php b/tests/VObject/Component/VCardTest.php
@@ -84,7 +84,6 @@ function validateData() {
             ],
             "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;;;;;;\r\nFN:Doe\r\nEND:VCARD\r\n",
         ];
-
         // No FN, ORG fallback
         $tests[] = [
             "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nORG:Acme Co.\r\nEND:VCARD\r\n",
@@ -93,6 +92,14 @@ function validateData() {
             ],
             "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nORG:Acme Co.\r\nFN:Acme Co.\r\nEND:VCARD\r\n",
         ];
+        // No FN, EMAIL fallback
+        $tests[] = [
+            "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nEMAIL:1@example.org\r\nEND:VCARD\r\n",
+            [
+                'The FN property must appear in the VCARD component exactly 1 time',
+            ],
+            "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nEMAIL:1@example.org\r\nFN:1@example.org\r\nEND:VCARD\r\n",
+        ];
         return $tests;
 
     }