Multiline note parsing

Author: h44z

src/VCard.php

@@ -379,7 +379,7 @@ public function buildVCard()
         $properties = $this->getProperties();
         foreach ($properties as $property) {
             // add to string
-            $string .= $this->fold($property['key'] . ':' . $property['value'] . "\r\n");
+            $string .= $this->fold($property['key'] . ':' . $this->escape($property['value']) . "\r\n");
         }
 
         // add to string
@@ -490,6 +490,21 @@ protected function fold($text)
         // split, wrap and trim trailing separator
         return substr(chunk_split($text, 73, "\r\n "), 0, -3);
     }
+    
+    /**
+     * Escape newline characters according to RFC2425 section 5.8.4.
+     *
+     * @link http://tools.ietf.org/html/rfc2425#section-5.8.4
+     * @param  string $text
+     * @return string
+     */
+    protected function escape($text)
+    {
+        $text = str_replace("\r\n", "\\n", $text);
+        $text = str_replace("\n", "\\n", $text);
+        
+        return $text;
+    }
 
     /**
      * Get output as string

src/VCardParser.php

@@ -256,7 +256,7 @@ protected function parse()
                         }
                         break;
                     case 'NOTE':
-                        $cardData->note = $value;
+                        $cardData->note = $this->unescape($value);
                         break;
                 }
             }
@@ -308,4 +308,8 @@ protected function parseAddress($value)
         );
     }
 
+    protected function unescape($text)
+    {
+        return str_replace("\\n", PHP_EOL, $text);
+    }
 }

tests/VCardParserTest.php

@@ -161,11 +161,11 @@ public function testNote()
         $parser = new VCardParser($vcard->buildVCard());
 
         $vcardMultiline = new VCard();
-        $vcardMultiline->addNote("This is a multiline note\nNew line content!");
+        $vcardMultiline->addNote("This is a multiline note\nNew line content!\r\nLine 2");
         $parserMultiline = new VCardParser($vcardMultiline->buildVCard());
 
         $this->assertEquals($parser->getCardAtIndex(0)->note, 'This is a testnote');
-        $this->assertEquals($parserMultiline->getCardAtIndex(0)->note, "This is a multiline note\nNew line content!");
+        $this->assertEquals(nl2br($parserMultiline->getCardAtIndex(0)->note), nl2br("This is a multiline note" . PHP_EOL . "New line content!" . PHP_EOL . "Line 2"));
     }
 
     public function testTitle()