Properly parse carddav address-data - fixes #1017

sabre-io · Jan 19, 2018 · 16a2c2e · 16a2c2e
1 parent 4d4da96
commit 16a2c2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/CardDAV/Xml/Filter/AddressData.php b/lib/CardDAV/Xml/Filter/AddressData.php
@@ -53,7 +53,7 @@ static function xmlDeserialize(Reader $reader) {
 
         $elems = (array)$reader->parseInnerTree();
         $result['addressDataProperties'] = array_map(function($element) {
-            return $element['attributes']['name'];
+            return $element['name'];
         }, $elems);
 
         return $result;

diff --git a/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetTest.php b/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetTest.php
@@ -19,7 +19,9 @@ function testDeserialize() {
   <d:prop>
     <d:getcontenttype />
     <d:getetag />
-    <CARD:address-data content-type="text/vcard" version="4.0" />
+    <CARD:address-data content-type="text/vcard" version="4.0">
+        <CARD:allprop/>
+    </CARD:address-data>
   </d:prop>
   <d:href>/foo.vcf</d:href>
 </CARD:addressbook-multiget>
@@ -35,7 +37,9 @@ function testDeserialize() {
         $addressBookMultiGetReport->hrefs = ['/foo.vcf'];
         $addressBookMultiGetReport->contentType = 'text/vcard';
         $addressBookMultiGetReport->version = '4.0';
-        $addressBookMultiGetReport->addressDataProperties = [];
+        $addressBookMultiGetReport->addressDataProperties = [
+            '{urn:ietf:params:xml:ns:carddav}allprop'
+        ];
 
 
         $this->assertEquals(