upgrade to sabre32

5 files changed, 83 insertions, 216 deletions

diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
index 7fb022e33..1ca64f3e8 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
@@ -5,6 +5,7 @@ namespace Sabre\CalDAV\Xml\Notification;
 use Sabre\Xml\Writer;
 use Sabre\CalDAV\SharingPlugin as SharingPlugin;
 use Sabre\CalDAV;
+use Sabre\DAV;
 
 /**
  * This class represents the cs:invite-notification notification element.
@@ -210,16 +211,10 @@ class Invite implements NotificationInterface {
 
         switch ($this->type) {
 
-            case SharingPlugin::STATUS_ACCEPTED :
+            case DAV\Sharing\Plugin::INVITE_ACCEPTED :
                 $writer->writeElement($cs . 'invite-accepted');
                 break;
-            case SharingPlugin::STATUS_DECLINED :
-                $writer->writeElement($cs . 'invite-declined');
-                break;
-            case SharingPlugin::STATUS_DELETED :
-                $writer->writeElement($cs . 'invite-deleted');
-                break;
-            case SharingPlugin::STATUS_NORESPONSE :
+            case DAV\Sharing\Plugin::INVITE_NORESPONSE :
                 $writer->writeElement($cs . 'invite-noresponse');
                 break;
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
index 945323fed..51bfc178a 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
@@ -5,6 +5,7 @@ namespace Sabre\CalDAV\Xml\Notification;
 use Sabre\Xml\Writer;
 use Sabre\CalDAV;
 use Sabre\CalDAV\SharingPlugin;
+use Sabre\DAV;
 
 /**
  * This class represents the cs:invite-reply notification element.
@@ -162,10 +163,10 @@ class InviteReply implements NotificationInterface {
 
         switch ($this->type) {
 
-            case SharingPlugin::STATUS_ACCEPTED :
+            case DAV\Sharing\Plugin::INVITE_ACCEPTED :
                 $writer->writeElement($cs . 'invite-accepted');
                 break;
-            case SharingPlugin::STATUS_DECLINED :
+            case DAV\Sharing\Plugin::INVITE_DECLINED :
                 $writer->writeElement($cs . 'invite-declined');
                 break;
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
index 3ee053214..40ff6b936 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
@@ -2,11 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
-use Sabre\Xml\Element;
-use Sabre\Xml\Reader;
+use Sabre\Xml\XmlSerializable;
 use Sabre\Xml\Writer;
 use Sabre\CalDAV\Plugin;
-use Sabre\CalDAV\SharingPlugin;
+use Sabre\DAV;
 
 /**
  * Invite property
@@ -20,53 +19,23 @@ use Sabre\CalDAV\SharingPlugin;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Invite implements Element {
+class Invite implements XmlSerializable {
 
     /**
      * The list of users a calendar has been shared to.
      *
-     * @var array
+     * @var Sharee[]
      */
-    protected $users;
-
-    /**
-     * The organizer contains information about the person who shared the
-     * object.
-     *
-     * @var array
-     */
-    protected $organizer;
+    protected $sharees;
 
     /**
      * Creates the property.
      *
-     * Users is an array. Each element of the array has the following
-     * properties:
-     *
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first and lastname for a user.
-     *   * status - One of the SharingPlugin::STATUS_* constants.
-     *   * readOnly - true or false
-     *   * summary - Optional, description of the share
-     *
-     * The organizer key is optional to specify. It's only useful when a
-     * 'sharee' requests the sharing information.
-     *
-     * The organizer may have the following properties:
-     *   * href - Often a mailto: address.
-     *   * commonName - Optional human-readable name.
-     *   * firstName - Optional first name.
-     *   * lastName - Optional last name.
-     *
-     * If you wonder why these two structures are so different, I guess a
-     * valid answer is that the current spec is still a draft.
-     *
-     * @param array $users
+     * @param Sharee[] $sharees
      */
-    function __construct(array $users, array $organizer = null) {
+    function __construct(array $sharees) {
 
-        $this->users = $users;
-        $this->organizer = $organizer;
+        $this->sharees = $sharees;
 
     }
 
@@ -77,7 +46,7 @@ class Invite implements Element {
      */
     function getValue() {
 
-        return $this->users;
+        return $this->sharees;
 
     }
 
@@ -104,149 +73,55 @@ class Invite implements Element {
 
         $cs = '{' . Plugin::NS_CALENDARSERVER . '}';
 
-        if (!is_null($this->organizer)) {
-
-            $writer->startElement($cs . 'organizer');
-            $writer->writeElement('{DAV:}href', $this->organizer['href']);
-
-            if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-                $writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
-            }
-            if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-                $writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
-            }
-            if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-                $writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
-            }
-            $writer->endElement(); // organizer
+        foreach ($this->sharees as $sharee) {
 
-        }
-
-        foreach ($this->users as $user) {
-
-            $writer->startElement($cs . 'user');
-            $writer->writeElement('{DAV:}href', $user['href']);
-            if (isset($user['commonName']) && $user['commonName']) {
-                $writer->writeElement($cs . 'common-name', $user['commonName']);
-            }
-            switch ($user['status']) {
-
-                case SharingPlugin::STATUS_ACCEPTED :
-                    $writer->writeElement($cs . 'invite-accepted');
-                    break;
-                case SharingPlugin::STATUS_DECLINED :
-                    $writer->writeElement($cs . 'invite-declined');
-                    break;
-                case SharingPlugin::STATUS_NORESPONSE :
-                    $writer->writeElement($cs . 'invite-noresponse');
-                    break;
-                case SharingPlugin::STATUS_INVALID :
-                    $writer->writeElement($cs . 'invite-invalid');
-                    break;
-            }
-
-            $writer->startElement($cs . 'access');
-            if ($user['readOnly']) {
-                $writer->writeElement($cs . 'read');
+            if ($sharee->access === \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER) {
+                $writer->startElement($cs . 'organizer');
             } else {
-                $writer->writeElement($cs . 'read-write');
-            }
-            $writer->endElement(); // access
-
-            if (isset($user['summary']) && $user['summary']) {
-                $writer->writeElement($cs . 'summary', $user['summary']);
-            }
-
-            $writer->endElement(); //user
-
-        }
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, 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
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $cs = '{' . Plugin::NS_CALENDARSERVER . '}';
-
-        $users = [];
-
-        foreach ($reader->parseInnerTree() as $elem) {
+                $writer->startElement($cs . 'user');
 
-            if ($elem['name'] !== $cs . 'user')
-                continue;
-
-            $user = [
-                'href'       => null,
-                'commonName' => null,
-                'readOnly'   => null,
-                'summary'    => null,
-                'status'     => null,
-            ];
-
-            foreach ($elem['value'] as $userElem) {
-
-                switch ($userElem['name']) {
-                    case $cs . 'invite-accepted' :
-                        $user['status'] = SharingPlugin::STATUS_ACCEPTED;
-                        break;
-                    case $cs . 'invite-declined' :
-                        $user['status'] = SharingPlugin::STATUS_DECLINED;
+                switch ($sharee->inviteStatus) {
+                    case DAV\Sharing\Plugin::INVITE_ACCEPTED :
+                        $writer->writeElement($cs . 'invite-accepted');
                         break;
-                    case $cs . 'invite-noresponse' :
-                        $user['status'] = SharingPlugin::STATUS_NORESPONSE;
+                    case DAV\Sharing\Plugin::INVITE_DECLINED :
+                        $writer->writeElement($cs . 'invite-declined');
                         break;
-                    case $cs . 'invite-invalid' :
-                        $user['status'] = SharingPlugin::STATUS_INVALID;
+                    case DAV\Sharing\Plugin::INVITE_NORESPONSE :
+                        $writer->writeElement($cs . 'invite-noresponse');
                         break;
-                    case '{DAV:}href' :
-                        $user['href'] = $userElem['value'];
+                    case DAV\Sharing\Plugin::INVITE_INVALID :
+                        $writer->writeElement($cs . 'invite-invalid');
                         break;
-                    case $cs . 'common-name' :
-                        $user['commonName'] = $userElem['value'];
-                        break;
-                    case $cs . 'access' :
-                        foreach ($userElem['value'] as $accessHref) {
-                            if ($accessHref['name'] === $cs . 'read') {
-                                $user['readOnly'] = true;
-                            }
-                        }
+                }
+
+                $writer->startElement($cs . 'access');
+                switch ($sharee->access) {
+                    case DAV\Sharing\Plugin::ACCESS_READWRITE :
+                        $writer->writeElement($cs . 'read-write');
                         break;
-                    case $cs . 'summary' :
-                        $user['summary'] = $userElem['value'];
+                    case DAV\Sharing\Plugin::ACCESS_READ :
+                        $writer->writeElement($cs . 'read');
                         break;
 
                 }
+                $writer->endElement(); // access
 
             }
-            if (!$user['status']) {
-                throw new \InvalidArgumentException('Every user must have one of cs:invite-accepted, cs:invite-declined, cs:invite-noresponse or cs:invite-invalid');
-            }
 
-            $users[] = $user;
+            $href = new \Sabre\DAV\Xml\Property\Href($sharee->href);
+            $href->xmlSerialize($writer);
 
-        }
+            if (isset($sharee->properties['{DAV:}displayname'])) {
+                $writer->writeElement($cs . 'common-name', $sharee->properties['{DAV:}displayname']);
+            }
+            if ($sharee->comment) {
+                $writer->writeElement($cs . 'summary', $sharee->comment);
+            }
+            $writer->endElement(); // organizer or user
 
-        return new self($users);
+        }
 
     }
+
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
index ec627156f..2ecf6c2bb 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
@@ -2,12 +2,13 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\CalDAV\SharingPlugin;
+use Sabre\DAV;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
 use Sabre\Xml\Element\KeyValue;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CalDAV\Plugin;
-use Sabre\CalDAV\SharingPlugin;
 
 /**
  * Invite-reply POST request parser
@@ -121,10 +122,10 @@ class InviteReply implements XmlDeserializable {
                     }
                     break;
                 case '{' . Plugin::NS_CALENDARSERVER . '}invite-accepted' :
-                    $status = SharingPlugin::STATUS_ACCEPTED;
+                    $status = DAV\Sharing\Plugin::INVITE_ACCEPTED;
                     break;
                 case '{' . Plugin::NS_CALENDARSERVER . '}invite-declined' :
-                    $status = SharingPlugin::STATUS_DECLINED;
+                    $status = DAV\Sharing\Plugin::INVITE_DECLINED;
                     break;
                 case '{' . Plugin::NS_CALENDARSERVER . '}in-reply-to' :
                     $inReplyTo = $value;
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
index dacc5dc94..b5d9a133c 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
@@ -2,9 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Xml\Element\Sharee;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\CalDAV\Plugin;
 
 /**
  * Share POST request parser
@@ -20,37 +21,20 @@ use Sabre\CalDAV\Plugin;
 class Share implements XmlDeserializable {
 
     /**
-     * The list of new people added or updated.
-     *
-     * Every element has the following keys:
-     * 1. href - An email address
-     * 2. commonName - Some name
-     * 3. summary - An optional description of the share
-     * 4. readOnly - true or false
-     *
-     * @var array
-     */
-    public $set = [];
-
-    /**
-     * List of people removed from the share list.
-     *
-     * The list is a flat list of email addresses (including mailto:).
+     * The list of new people added or updated or removed from the share.
      *
-     * @var array
+     * @var Sharee[]
      */
-    public $remove = [];
+    public $sharees = [];
 
     /**
      * Constructor
      *
-     * @param array $set
-     * @param array $remove
+     * @param Sharee[] $sharees
      */
-    function __construct(array $set, array $remove) {
+    function __construct(array $sharees) {
 
-        $this->set = $set;
-        $this->remove = $remove;
+        $this->sharees = $sharees;
 
     }
 
@@ -77,13 +61,12 @@ class Share implements XmlDeserializable {
      */
     static function xmlDeserialize(Reader $reader) {
 
-        $elems = $reader->parseInnerTree([
+        $elems = $reader->parseGetElements([
             '{' . Plugin::NS_CALENDARSERVER . '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
             '{' . Plugin::NS_CALENDARSERVER . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
         ]);
 
-        $set = [];
-        $remove = [];
+        $sharees = [];
 
         foreach ($elems as $elem) {
             switch ($elem['name']) {
@@ -94,22 +77,34 @@ class Share implements XmlDeserializable {
                     $sumElem = '{' . Plugin::NS_CALENDARSERVER . '}summary';
                     $commonName = '{' . Plugin::NS_CALENDARSERVER . '}common-name';
 
-                    $set[] = [
+                    $properties = [];
+                    if (isset($sharee[$commonName])) {
+                        $properties['{DAV:}displayname'] = $sharee[$commonName];
+                    }
+
+                    $access = array_key_exists('{' . Plugin::NS_CALENDARSERVER . '}read-write', $sharee)
+                        ? \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE
+                        : \Sabre\DAV\Sharing\Plugin::ACCESS_READ;
+
+                    $sharees[] = new Sharee([
                         'href'       => $sharee['{DAV:}href'],
-                        'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
-                        'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-                        'readOnly'   => !array_key_exists('{' . Plugin::NS_CALENDARSERVER . '}read-write', $sharee),
-                    ];
+                        'properties' => $properties,
+                        'access'     => $access,
+                        'comment'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null
+                    ]);
                     break;
 
                 case '{' . Plugin::NS_CALENDARSERVER . '}remove' :
-                    $remove[] = $elem['value']['{DAV:}href'];
+                    $sharees[] = new Sharee([
+                        'href'   => $elem['value']['{DAV:}href'],
+                        'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS
+                    ]);
                     break;
 
             }
         }
 
-        return new self($set, $remove);
+        return new self($sharees);
 
     }