[Pkg-owncloud-commits] [php-sabre-vobject] 253/341: SOUND is of type TEXT by default, URI with xCard.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit b48ca8f1991e41244b932e0133b1fccf7a656fea
Author: Ivan Enderlin <ivan.enderlin at hoa-project.net>
Date:   Fri Jan 30 09:26:37 2015 +0100

    SOUND is of type TEXT by default, URI with xCard.
    
    xCard to vCard means `SOUND` is of type `URI` because xCard is
    version 4.0, but the opposite is not true.
---
 lib/Component/VCard.php          |  2 +-
 tests/VObject/Parser/XmlTest.php | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
index 16d512f..ed99fc5 100644
--- a/lib/Component/VCard.php
+++ b/lib/Component/VCard.php
@@ -84,7 +84,7 @@ class VCard extends VObject\Document {
         'ORG'     => 'Sabre\\VObject\\Property\\Text',
         'NOTE'    => 'Sabre\\VObject\\Property\\FlatText',
         'REV'     => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
-        'SOUND'   => 'Sabre\\VObject\\Property\\Uri',
+        'SOUND'   => 'Sabre\\VObject\\Property\\FlatText',
         'URL'     => 'Sabre\\VObject\\Property\\Uri',
         'UID'     => 'Sabre\\VObject\\Property\\FlatText',
         'VERSION' => 'Sabre\\VObject\\Property\\FlatText',
diff --git a/tests/VObject/Parser/XmlTest.php b/tests/VObject/Parser/XmlTest.php
index cd92ccd..a4e59bc 100644
--- a/tests/VObject/Parser/XmlTest.php
+++ b/tests/VObject/Parser/XmlTest.php
@@ -2594,7 +2594,7 @@ XML
      */
     function testRFC6350Section6_7_5() {
 
-        $this->assertXMLReflexivelyEqualsToMimeDir(
+        $this->assertXMLEqualsToMimeDir(
 <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
@@ -2612,6 +2612,24 @@ XML
             'END:VCARD' . CRLF
         );
 
+        $this->assertXMLReflexivelyEqualsToMimeDir(
+<<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
+ <vcard>
+  <sound>
+   <text>CID:JOHNQPUBLIC.part8.19960229T080000.xyzMail at example.com</text>
+  </sound>
+ </vcard>
+</vcards>
+XML
+,
+            'BEGIN:VCARD' . CRLF .
+            'VERSION:4.0' . CRLF .
+            'SOUND:CID:JOHNQPUBLIC.part8.19960229T080000.xyzMail at example.com' . CRLF .
+            'END:VCARD' . CRLF
+        );
+
     }
 
     /**

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git