diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-05-04 10:51:39 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-05-04 10:51:39 +0200 |
commit | 5c7acf4807aa427cf1391e0a5d044b453c38e619 (patch) | |
tree | 3fe49d4c3f75b0e2c9605327a3951f1da28e28b6 /vendor/sabre/dav/lib/CardDAV/Xml/Filter | |
parent | a92b9b7adb2be489106138b6269a5f7fe8eea5aa (diff) | |
download | volse-hubzilla-5c7acf4807aa427cf1391e0a5d044b453c38e619.tar.gz volse-hubzilla-5c7acf4807aa427cf1391e0a5d044b453c38e619.tar.bz2 volse-hubzilla-5c7acf4807aa427cf1391e0a5d044b453c38e619.zip |
update sabredav to version 3.2.2
Diffstat (limited to 'vendor/sabre/dav/lib/CardDAV/Xml/Filter')
-rw-r--r-- | vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php | 8 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php | 6 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php index 34028db85..a130cd61d 100644 --- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php +++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php @@ -26,7 +26,7 @@ class AddressData implements XmlDeserializable { /** * The deserialize method is called during xml parsing. * - * This method is called statictly, this is because in theory this method + * This method is called statically, this is because in theory this method * may be used as a type of constructor, or factory method. * * Often you want to return an instance of the current class, but you are @@ -51,7 +51,11 @@ class AddressData implements XmlDeserializable { 'version' => $reader->getAttribute('version') ?: '3.0', ]; - $reader->next(); + $elems = (array)$reader->parseInnerTree(); + $result['addressDataProperties'] = array_map(function($element) { + return $element['attributes']['name']; + }, $elems); + return $result; } diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php index 9646ae3e6..936e26917 100644 --- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php +++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php @@ -2,10 +2,10 @@ namespace Sabre\CardDAV\Xml\Filter; +use Sabre\CardDAV\Plugin; +use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Element; use Sabre\Xml\Reader; -use Sabre\DAV\Exception\BadRequest; -use Sabre\CardDAV\Plugin; /** * ParamFilter parser. @@ -26,7 +26,7 @@ abstract class ParamFilter implements Element { /** * The deserialize method is called during xml parsing. * - * This method is called statictly, this is because in theory this method + * This method is called statically, this is because in theory this method * may be used as a type of constructor, or factory method. * * Often you want to return an instance of the current class, but you are diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php index c162da160..d7799429d 100644 --- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php +++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php @@ -2,10 +2,10 @@ namespace Sabre\CardDAV\Xml\Filter; +use Sabre\CardDAV\Plugin; +use Sabre\DAV\Exception\BadRequest; use Sabre\Xml\Reader; use Sabre\Xml\XmlDeserializable; -use Sabre\DAV\Exception\BadRequest; -use Sabre\CardDAV\Plugin; /** * PropFilter parser. @@ -26,7 +26,7 @@ class PropFilter implements XmlDeserializable { /** * The deserialize method is called during xml parsing. * - * This method is called statictly, this is because in theory this method + * This method is called statically, this is because in theory this method * may be used as a type of constructor, or factory method. * * Often you want to return an instance of the current class, but you are |