Merge pull request #138 from danielkesselberg/master

Add patch #1025 for sabre-dav

patches.txt

@@ -4,6 +4,7 @@ Patches:
 - Doctrine: fix error handling for not null columns on some mysql servers https://github.com/doctrine/dbal/pull/2422
 - SabreDAV: Make sure that files that are children of directories, are reported as files https://github.com/fruux/sabre-dav/issues/982
 - SabreDAV: Don't open the file on HEAD requests https://github.com/sabre-io/dav/pull/1058
+- SabreDAV: Properly parse carddav address-data https://github.com/sabre-io/dav/pull/1025
 - SabreXML: Fix invalid PHP docs https://github.com/fruux/sabre-xml/pull/128
 - SabreXML: Prevent infinite loops for empty props element https://github.com/fruux/sabre-xml/pull/132
 - ZipStreamer: Fix zip generation for 7zip https://github.com/McNetic/PHPZipStreamer/pull/39

sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php

@@ -52,12 +52,15 @@ static function xmlDeserialize(Reader $reader) {
         ];
 
         $elems = (array)$reader->parseInnerTree();
+        $elems = array_filter($elems, function($element) {
+            return $element['name'] === '{urn:ietf:params:xml:ns:carddav}prop' &&
+                isset($element['attributes']['name']);
+        });
         $result['addressDataProperties'] = array_map(function($element) {
             return $element['attributes']['name'];
         }, $elems);
 
         return $result;
-
     }
 
 }