YetiForceCompany / YetiForceCRM

libraries/SabreDAV/CalDAV/Xml/Notification/SystemStatus.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Xml\Notification;
 
-use Sabre\Xml\Writer;
 use Sabre\CalDAV\Plugin;
+use Sabre\Xml\Writer;
 
 /**
  * SystemStatus notification

Indentation +153 added lines, -153 removed lines

@@ -17,166 +17,166 @@
  */
 class SystemStatus implements NotificationInterface {
 
-    const TYPE_LOW = 1;
-    const TYPE_MEDIUM = 2;
-    const TYPE_HIGH = 3;
-
-    /**
-     * A unique id
-     *
-     * @var string
-     */
-    protected $id;
-
-    /**
-     * The type of alert. This should be one of the TYPE_ constants.
-     *
-     * @var int
-     */
-    protected $type;
-
-    /**
-     * A human-readable description of the problem.
-     *
-     * @var string
-     */
-    protected $description;
-
-    /**
-     * A url to a website with more information for the user.
-     *
-     * @var string
-     */
-    protected $href;
-
-    /**
-     * Notification Etag
-     *
-     * @var string
-     */
-    protected $etag;
-
-    /**
-     * Creates the notification.
-     *
-     * Some kind of unique id should be provided. This is used to generate a
-     * url.
-     *
-     * @param string $id
-     * @param string $etag
-     * @param int $type
-     * @param string $description
-     * @param string $href
-     */
-    public function __construct($id, $etag, $type = self::TYPE_HIGH, $description = null, $href = null) {
-
-        $this->id = $id;
-        $this->type = $type;
-        $this->description = $description;
-        $this->href = $href;
-        $this->etag = $etag;
-
-    }
-
-    /**
-     * The serialize method is called during xml writing.
-     *
-     * It should use the $writer argument to encode this object into XML.
-     *
-     * Important note: it is not needed to create the parent element. The
-     * parent element is already created, and we only have to worry about
-     * attributes, child elements and text (if any).
-     *
-     * Important note 2: If you are writing any new elements, you are also
-     * responsible for closing them.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        switch ($this->type) {
-            case self::TYPE_LOW :
-                $type = 'low';
-                break;
-            case self::TYPE_MEDIUM :
-                $type = 'medium';
-                break;
-            default :
-            case self::TYPE_HIGH :
-                $type = 'high';
-                break;
-        }
-
-        $writer->startElement('{' . Plugin::NS_CALENDARSERVER . '}systemstatus');
-        $writer->writeAttribute('type', $type);
-        $writer->endElement();
-
-    }
-
-    /**
-     * This method serializes the entire notification, as it is used in the
-     * response body.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerializeFull(Writer $writer) {
-
-        $cs = '{' . Plugin::NS_CALENDARSERVER . '}';
-        switch ($this->type) {
-            case self::TYPE_LOW :
-                $type = 'low';
-                break;
-            case self::TYPE_MEDIUM :
-                $type = 'medium';
-                break;
-            default :
-            case self::TYPE_HIGH :
-                $type = 'high';
-                break;
-        }
-
-        $writer->startElement($cs . 'systemstatus');
-        $writer->writeAttribute('type', $type);
-
-
-        if ($this->description) {
-            $writer->writeElement($cs . 'description', $this->description);
-        }
-        if ($this->href) {
-            $writer->writeElement('{DAV:}href', $this->href);
-        }
-
-        $writer->endElement(); // systemstatus
-
-    }
-
-    /**
-     * Returns a unique id for this notification
-     *
-     * This is just the base url. This should generally be some kind of unique
-     * id.
-     *
-     * @return string
-     */
-    public function getId() {
-
-        return $this->id;
-
-    }
-
-    /*
+	const TYPE_LOW = 1;
+	const TYPE_MEDIUM = 2;
+	const TYPE_HIGH = 3;
+
+	/**
+	 * A unique id
+	 *
+	 * @var string
+	 */
+	protected $id;
+
+	/**
+	 * The type of alert. This should be one of the TYPE_ constants.
+	 *
+	 * @var int
+	 */
+	protected $type;
+
+	/**
+	 * A human-readable description of the problem.
+	 *
+	 * @var string
+	 */
+	protected $description;
+
+	/**
+	 * A url to a website with more information for the user.
+	 *
+	 * @var string
+	 */
+	protected $href;
+
+	/**
+	 * Notification Etag
+	 *
+	 * @var string
+	 */
+	protected $etag;
+
+	/**
+	 * Creates the notification.
+	 *
+	 * Some kind of unique id should be provided. This is used to generate a
+	 * url.
+	 *
+	 * @param string $id
+	 * @param string $etag
+	 * @param int $type
+	 * @param string $description
+	 * @param string $href
+	 */
+	public function __construct($id, $etag, $type = self::TYPE_HIGH, $description = null, $href = null) {
+
+		$this->id = $id;
+		$this->type = $type;
+		$this->description = $description;
+		$this->href = $href;
+		$this->etag = $etag;
+
+	}
+
+	/**
+	 * The serialize method is called during xml writing.
+	 *
+	 * It should use the $writer argument to encode this object into XML.
+	 *
+	 * Important note: it is not needed to create the parent element. The
+	 * parent element is already created, and we only have to worry about
+	 * attributes, child elements and text (if any).
+	 *
+	 * Important note 2: If you are writing any new elements, you are also
+	 * responsible for closing them.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		switch ($this->type) {
+			case self::TYPE_LOW :
+				$type = 'low';
+				break;
+			case self::TYPE_MEDIUM :
+				$type = 'medium';
+				break;
+			default :
+			case self::TYPE_HIGH :
+				$type = 'high';
+				break;
+		}
+
+		$writer->startElement('{' . Plugin::NS_CALENDARSERVER . '}systemstatus');
+		$writer->writeAttribute('type', $type);
+		$writer->endElement();
+
+	}
+
+	/**
+	 * This method serializes the entire notification, as it is used in the
+	 * response body.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerializeFull(Writer $writer) {
+
+		$cs = '{' . Plugin::NS_CALENDARSERVER . '}';
+		switch ($this->type) {
+			case self::TYPE_LOW :
+				$type = 'low';
+				break;
+			case self::TYPE_MEDIUM :
+				$type = 'medium';
+				break;
+			default :
+			case self::TYPE_HIGH :
+				$type = 'high';
+				break;
+		}
+
+		$writer->startElement($cs . 'systemstatus');
+		$writer->writeAttribute('type', $type);
+
+
+		if ($this->description) {
+			$writer->writeElement($cs . 'description', $this->description);
+		}
+		if ($this->href) {
+			$writer->writeElement('{DAV:}href', $this->href);
+		}
+
+		$writer->endElement(); // systemstatus
+
+	}
+
+	/**
+	 * Returns a unique id for this notification
+	 *
+	 * This is just the base url. This should generally be some kind of unique
+	 * id.
+	 *
+	 * @return string
+	 */
+	public function getId() {
+
+		return $this->id;
+
+	}
+
+	/*
      * Returns the ETag for this notification.
      *
      * The ETag must be surrounded by literal double-quotes.
      *
      * @return string
      */
-    public function getETag() {
+	public function getETag() {
 
-        return $this->etag;
+		return $this->etag;
 
-    }
+	}
 
 }

libraries/SabreDAV/CalDAV/Xml/Property/AllowedSharingModes.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,9 +2,9 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
-use Sabre\Xml\XmlSerializable;
-use Sabre\Xml\Writer;
 use Sabre\CalDAV\Plugin;
+use Sabre\Xml\Writer;
+use Sabre\Xml\XmlSerializable;
 
 /**
  * AllowedSharingModes

Indentation +50 added lines, -50 removed lines

@@ -24,63 +24,63 @@
  */
 class AllowedSharingModes implements XmlSerializable {
 
-    /**
-     * Whether or not a calendar can be shared with another user
-     *
-     * @var bool
-     */
-    protected $canBeShared;
+	/**
+	 * Whether or not a calendar can be shared with another user
+	 *
+	 * @var bool
+	 */
+	protected $canBeShared;
 
-    /**
-     * Whether or not the calendar can be placed on a public url.
-     *
-     * @var bool
-     */
-    protected $canBePublished;
+	/**
+	 * Whether or not the calendar can be placed on a public url.
+	 *
+	 * @var bool
+	 */
+	protected $canBePublished;
 
-    /**
-     * Constructor
-     *
-     * @param bool $canBeShared
-     * @param bool $canBePublished
-     * @return void
-     */
-    public function __construct($canBeShared, $canBePublished) {
+	/**
+	 * Constructor
+	 *
+	 * @param bool $canBeShared
+	 * @param bool $canBePublished
+	 * @return void
+	 */
+	public function __construct($canBeShared, $canBePublished) {
 
-        $this->canBeShared = $canBeShared;
-        $this->canBePublished = $canBePublished;
+		$this->canBeShared = $canBeShared;
+		$this->canBePublished = $canBePublished;
 
-    }
+	}
 
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
 
-        if ($this->canBeShared) {
-            $writer->writeElement('{' . Plugin::NS_CALENDARSERVER . '}can-be-shared');
-        }
-        if ($this->canBePublished) {
-            $writer->writeElement('{' . Plugin::NS_CALENDARSERVER . '}can-be-published');
-        }
+		if ($this->canBeShared) {
+			$writer->writeElement('{' . Plugin::NS_CALENDARSERVER . '}can-be-shared');
+		}
+		if ($this->canBePublished) {
+			$writer->writeElement('{' . Plugin::NS_CALENDARSERVER . '}can-be-published');
+		}
 
-    }
+	}
 
 
 

libraries/SabreDAV/CalDAV/Xml/Property/Invite.php

Doc Comments +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return Invite
      */
     static function xmlDeserialize(Reader $reader) {
 

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\CalDAV\SharingPlugin;
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
 use Sabre\Xml\Writer;
-use Sabre\CalDAV\Plugin;
-use Sabre\CalDAV\SharingPlugin;
 
 /**
  * Invite property

Braces +3 added lines, -2 removed lines

@@ -192,8 +192,9 @@
 
         foreach ($reader->parseInnerTree() as $elem) {
 
-            if ($elem['name'] !== $cs . 'user')
-                continue;
+            if ($elem['name'] !== $cs . 'user') {
+                            continue;
+            }
 
             $user = [
                 'href'       => null,

Indentation +227 added lines, -227 removed lines

@@ -22,231 +22,231 @@
  */
 class Invite implements Element {
 
-    /**
-     * The list of users a calendar has been shared to.
-     *
-     * @var array
-     */
-    protected $users;
-
-    /**
-     * The organizer contains information about the person who shared the
-     * object.
-     *
-     * @var array
-     */
-    protected $organizer;
-
-    /**
-     * 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
-     */
-    public function __construct(array $users, array $organizer = null) {
-
-        $this->users = $users;
-        $this->organizer = $organizer;
-
-    }
-
-    /**
-     * Returns the list of users, as it was passed to the constructor.
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->users;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        $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->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');
-            } 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) {
-
-            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;
-                        break;
-                    case $cs . 'invite-noresponse' :
-                        $user['status'] = SharingPlugin::STATUS_NORESPONSE;
-                        break;
-                    case $cs . 'invite-invalid' :
-                        $user['status'] = SharingPlugin::STATUS_INVALID;
-                        break;
-                    case '{DAV:}href' :
-                        $user['href'] = $userElem['value'];
-                        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;
-                            }
-                        }
-                        break;
-                    case $cs . 'summary' :
-                        $user['summary'] = $userElem['value'];
-                        break;
-
-                }
-
-            }
-            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;
-
-        }
-
-        return new self($users);
-
-    }
+	/**
+	 * The list of users a calendar has been shared to.
+	 *
+	 * @var array
+	 */
+	protected $users;
+
+	/**
+	 * The organizer contains information about the person who shared the
+	 * object.
+	 *
+	 * @var array
+	 */
+	protected $organizer;
+
+	/**
+	 * 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
+	 */
+	public function __construct(array $users, array $organizer = null) {
+
+		$this->users = $users;
+		$this->organizer = $organizer;
+
+	}
+
+	/**
+	 * Returns the list of users, as it was passed to the constructor.
+	 *
+	 * @return array
+	 */
+	public function getValue() {
+
+		return $this->users;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		$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->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');
+			} 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) {
+
+			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;
+						break;
+					case $cs . 'invite-noresponse' :
+						$user['status'] = SharingPlugin::STATUS_NORESPONSE;
+						break;
+					case $cs . 'invite-invalid' :
+						$user['status'] = SharingPlugin::STATUS_INVALID;
+						break;
+					case '{DAV:}href' :
+						$user['href'] = $userElem['value'];
+						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;
+							}
+						}
+						break;
+					case $cs . 'summary' :
+						$user['summary'] = $userElem['value'];
+						break;
+
+				}
+
+			}
+			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;
+
+		}
+
+		return new self($users);
+
+	}
 }

libraries/SabreDAV/CalDAV/Xml/Property/ScheduleCalendarTransp.php

Doc Comments +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return null|ScheduleCalendarTransp
      */
     static function xmlDeserialize(Reader $reader) {
 

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
+use Sabre\CalDAV\Plugin;
 use Sabre\Xml\Element;
+use Sabre\Xml\Element\Elements;
 use Sabre\Xml\Reader;
 use Sabre\Xml\Writer;
-use Sabre\Xml\Element\Elements;
-use Sabre\CalDAV\Plugin;
 
 /**
  * schedule-calendar-transp property.

Braces +3 added lines, -2 removed lines

@@ -130,8 +130,9 @@
                     break;
             }
         }
-        if (is_null($value))
-           return null;
+        if (is_null($value)) {
+                   return null;
+        }
 
         return new self($value);
 

Indentation +110 added lines, -110 removed lines

@@ -26,115 +26,115 @@
  */
 class ScheduleCalendarTransp implements Element {
 
-    const TRANSPARENT = 'transparent';
-    const OPAQUE = 'opaque';
-
-    /**
-     * value
-     *
-     * @var string
-     */
-    protected $value;
-
-    /**
-     * Creates the property
-     *
-     * @param string $value
-     */
-    public function __construct($value) {
-
-        if ($value !== self::TRANSPARENT && $value !== self::OPAQUE) {
-            throw new \InvalidArgumentException('The value must either be specified as "transparent" or "opaque"');
-        }
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns the current value
-     *
-     * @return string
-     */
-    public function getValue() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        switch ($this->value) {
-            case self::TRANSPARENT :
-                $writer->writeElement('{' . Plugin::NS_CALDAV . '}transparent');
-                break;
-            case self::OPAQUE :
-                $writer->writeElement('{' . Plugin::NS_CALDAV . '}opaque');
-                break;
-        }
-
-    }
-
-    /**
-     * 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) {
-
-        $elems = Elements::xmlDeserialize($reader);
-
-        $value = null;
-
-        foreach ($elems as $elem) {
-            switch ($elem) {
-                case '{' . Plugin::NS_CALDAV . '}opaque' :
-                    $value = self::OPAQUE;
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}transparent' :
-                    $value = self::TRANSPARENT;
-                    break;
-            }
-        }
-        if (is_null($value))
-           return null;
-
-        return new self($value);
-
-    }
+	const TRANSPARENT = 'transparent';
+	const OPAQUE = 'opaque';
+
+	/**
+	 * value
+	 *
+	 * @var string
+	 */
+	protected $value;
+
+	/**
+	 * Creates the property
+	 *
+	 * @param string $value
+	 */
+	public function __construct($value) {
+
+		if ($value !== self::TRANSPARENT && $value !== self::OPAQUE) {
+			throw new \InvalidArgumentException('The value must either be specified as "transparent" or "opaque"');
+		}
+		$this->value = $value;
+
+	}
+
+	/**
+	 * Returns the current value
+	 *
+	 * @return string
+	 */
+	public function getValue() {
+
+		return $this->value;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		switch ($this->value) {
+			case self::TRANSPARENT :
+				$writer->writeElement('{' . Plugin::NS_CALDAV . '}transparent');
+				break;
+			case self::OPAQUE :
+				$writer->writeElement('{' . Plugin::NS_CALDAV . '}opaque');
+				break;
+		}
+
+	}
+
+	/**
+	 * 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) {
+
+		$elems = Elements::xmlDeserialize($reader);
+
+		$value = null;
+
+		foreach ($elems as $elem) {
+			switch ($elem) {
+				case '{' . Plugin::NS_CALDAV . '}opaque' :
+					$value = self::OPAQUE;
+					break;
+				case '{' . Plugin::NS_CALDAV . '}transparent' :
+					$value = self::TRANSPARENT;
+					break;
+			}
+		}
+		if (is_null($value))
+		   return null;
+
+		return new self($value);
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Xml/Property/SupportedCalendarComponentSet.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return SupportedCalendarComponentSet
      */
     static function xmlDeserialize(Reader $reader) {
 

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
+use Sabre\CalDAV\Plugin;
 use Sabre\Xml\Element;
 use Sabre\Xml\ParseException;
 use Sabre\Xml\Reader;
 use Sabre\Xml\Writer;
-use Sabre\CalDAV\Plugin;
 
 /**
  * SupportedCalendarComponentSet property.

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 
         $components = [];
 
-        foreach ((array)$elems as $elem) {
+        foreach ((array) $elems as $elem) {
             if ($elem['name'] === '{' . Plugin::NS_CALDAV . '}comp') {
                 $components[] = $elem['attributes']['name'];
             }

Indentation +102 added lines, -102 removed lines

@@ -23,107 +23,107 @@
  */
 class SupportedCalendarComponentSet implements Element {
 
-    /**
-     * List of supported components.
-     *
-     * This array will contain values such as VEVENT, VTODO and VJOURNAL.
-     *
-     * @var array
-     */
-    protected $components = [];
-
-    /**
-     * Creates the property.
-     *
-     * @param array $components
-     */
-    public function __construct(array $components) {
-
-        $this->components = $components;
-
-    }
-
-    /**
-     * Returns the list of supported components
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->components;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        foreach ($this->components as $component) {
-
-            $writer->startElement('{' . Plugin::NS_CALDAV . '}comp');
-            $writer->writeAttributes(['name' => $component]);
-            $writer->endElement();
-
-        }
-
-    }
-
-    /**
-     * 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) {
-
-        $elems = $reader->parseInnerTree();
-
-        $components = [];
-
-        foreach ((array)$elems as $elem) {
-            if ($elem['name'] === '{' . Plugin::NS_CALDAV . '}comp') {
-                $components[] = $elem['attributes']['name'];
-            }
-        }
-
-        if (!$components) {
-            throw new ParseException('supported-calendar-component-set must have at least one CALDAV:comp element');
-        }
-
-        return new self($components);
-
-    }
+	/**
+	 * List of supported components.
+	 *
+	 * This array will contain values such as VEVENT, VTODO and VJOURNAL.
+	 *
+	 * @var array
+	 */
+	protected $components = [];
+
+	/**
+	 * Creates the property.
+	 *
+	 * @param array $components
+	 */
+	public function __construct(array $components) {
+
+		$this->components = $components;
+
+	}
+
+	/**
+	 * Returns the list of supported components
+	 *
+	 * @return array
+	 */
+	public function getValue() {
+
+		return $this->components;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		foreach ($this->components as $component) {
+
+			$writer->startElement('{' . Plugin::NS_CALDAV . '}comp');
+			$writer->writeAttributes(['name' => $component]);
+			$writer->endElement();
+
+		}
+
+	}
+
+	/**
+	 * 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) {
+
+		$elems = $reader->parseInnerTree();
+
+		$components = [];
+
+		foreach ((array)$elems as $elem) {
+			if ($elem['name'] === '{' . Plugin::NS_CALDAV . '}comp') {
+				$components[] = $elem['attributes']['name'];
+			}
+		}
+
+		if (!$components) {
+			throw new ParseException('supported-calendar-component-set must have at least one CALDAV:comp element');
+		}
+
+		return new self($components);
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Xml/Request/CalendarMultiGetReport.php

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return CalendarMultiGetReport
      */
     static function xmlDeserialize(Reader $reader) {
 

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
-use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Reader;
 use Sabre\CalDAV\Plugin;
 use Sabre\Uri;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * CalendarMultiGetReport request parser.

Indentation +99 added lines, -99 removed lines

@@ -21,104 +21,104 @@
  */
 class CalendarMultiGetReport implements XmlDeserializable {
 
-    /**
-     * An array with requested properties.
-     *
-     * @var array
-     */
-    public $properties;
-
-    /**
-     * This is an array with the urls that are being requested.
-     *
-     * @var array
-     */
-    public $hrefs;
-
-    /**
-     * If the calendar data must be expanded, this will contain an array with 2
-     * elements: start and end.
-     *
-     * Each may be a DateTime or null.
-     *
-     * @var array|null
-     */
-    public $expand = null;
-
-    /**
-     * The mimetype of the content that should be returend. Usually
-     * text/calendar.
-     *
-     * @var string
-     */
-    public $contentType = null;
-
-    /**
-     * The version of calendar-data that should be returned. Usually '2.0',
-     * referring to iCalendar 2.0.
-     *
-     * @var string
-     */
-    public $version = null;
-
-    /**
-     * 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) {
-
-        $elems = $reader->parseInnerTree([
-            '{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
-            '{DAV:}prop'                                   => 'Sabre\\Xml\\Element\\KeyValue',
-        ]);
-
-        $newProps = [
-            'hrefs'      => [],
-            'properties' => [],
-        ];
-
-        foreach ($elems as $elem) {
-
-            switch ($elem['name']) {
-
-                case '{DAV:}prop' :
-                    $newProps['properties'] = array_keys($elem['value']);
-                    if (isset($elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
-                        $newProps += $elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'];
-                    }
-                    break;
-                case '{DAV:}href' :
-                    $newProps['hrefs'][] = Uri\resolve($reader->contextUri, $elem['value']);
-                    break;
-
-            }
-
-        }
-
-        $obj = new self();
-        foreach ($newProps as $key => $value) {
-            $obj->$key = $value;
-        }
-
-        return $obj;
-
-    }
+	/**
+	 * An array with requested properties.
+	 *
+	 * @var array
+	 */
+	public $properties;
+
+	/**
+	 * This is an array with the urls that are being requested.
+	 *
+	 * @var array
+	 */
+	public $hrefs;
+
+	/**
+	 * If the calendar data must be expanded, this will contain an array with 2
+	 * elements: start and end.
+	 *
+	 * Each may be a DateTime or null.
+	 *
+	 * @var array|null
+	 */
+	public $expand = null;
+
+	/**
+	 * The mimetype of the content that should be returend. Usually
+	 * text/calendar.
+	 *
+	 * @var string
+	 */
+	public $contentType = null;
+
+	/**
+	 * The version of calendar-data that should be returned. Usually '2.0',
+	 * referring to iCalendar 2.0.
+	 *
+	 * @var string
+	 */
+	public $version = null;
+
+	/**
+	 * 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) {
+
+		$elems = $reader->parseInnerTree([
+			'{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
+			'{DAV:}prop'                                   => 'Sabre\\Xml\\Element\\KeyValue',
+		]);
+
+		$newProps = [
+			'hrefs'      => [],
+			'properties' => [],
+		];
+
+		foreach ($elems as $elem) {
+
+			switch ($elem['name']) {
+
+				case '{DAV:}prop' :
+					$newProps['properties'] = array_keys($elem['value']);
+					if (isset($elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
+						$newProps += $elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'];
+					}
+					break;
+				case '{DAV:}href' :
+					$newProps['hrefs'][] = Uri\resolve($reader->contextUri, $elem['value']);
+					break;
+
+			}
+
+		}
+
+		$obj = new self();
+		foreach ($newProps as $key => $value) {
+			$obj->$key = $value;
+		}
+
+		return $obj;
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Xml/Request/CalendarQueryReport.php

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return CalendarQueryReport
      */
     static function xmlDeserialize(Reader $reader) {
 

Unused Use Statements +3 added lines, -3 removed lines

@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
-use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Reader;
-use Sabre\DAV\Exception\BadRequest;
 use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * CalendarQueryReport request parser.

Indentation +114 added lines, -114 removed lines

@@ -21,119 +21,119 @@
  */
 class CalendarQueryReport implements XmlDeserializable {
 
-    /**
-     * An array with requested properties.
-     *
-     * @var array
-     */
-    public $properties;
-
-    /**
-     * List of property/component filters.
-     *
-     * @var array
-     */
-    public $filters;
-
-    /**
-     * If the calendar data must be expanded, this will contain an array with 2
-     * elements: start and end.
-     *
-     * Each may be a DateTime or null.
-     *
-     * @var array|null
-     */
-    public $expand = null;
-
-    /**
-     * The mimetype of the content that should be returend. Usually
-     * text/calendar.
-     *
-     * @var string
-     */
-    public $contentType = null;
-
-    /**
-     * The version of calendar-data that should be returned. Usually '2.0',
-     * referring to iCalendar 2.0.
-     *
-     * @var string
-     */
-    public $version = null;
-
-    /**
-     * 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) {
-
-        $elems = $reader->parseInnerTree([
-            '{urn:ietf:params:xml:ns:caldav}comp-filter'   => 'Sabre\\CalDAV\\Xml\\Filter\\CompFilter',
-            '{urn:ietf:params:xml:ns:caldav}prop-filter'   => 'Sabre\\CalDAV\\Xml\\Filter\\PropFilter',
-            '{urn:ietf:params:xml:ns:caldav}param-filter'  => 'Sabre\\CalDAV\\Xml\\Filter\\ParamFilter',
-            '{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
-            '{DAV:}prop'                                   => 'Sabre\\Xml\\Element\\KeyValue',
-        ]);
-
-        $newProps = [
-            'filters'    => null,
-            'properties' => [],
-        ];
-
-        if (!is_array($elems)) $elems = [];
-
-        foreach ($elems as $elem) {
-
-            switch ($elem['name']) {
-
-                case '{DAV:}prop' :
-                    $newProps['properties'] = array_keys($elem['value']);
-                    if (isset($elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
-                        $newProps += $elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'];
-                    }
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}filter' :
-                    foreach ($elem['value'] as $subElem) {
-                        if ($subElem['name'] === '{' . Plugin::NS_CALDAV . '}comp-filter') {
-                            if (!is_null($newProps['filters'])) {
-                                throw new BadRequest('Only one top-level comp-filter may be defined');
-                            }
-                            $newProps['filters'] = $subElem['value'];
-                        }
-                    }
-                    break;
-
-            }
-
-        }
-
-        if (is_null($newProps['filters'])) {
-            throw new BadRequest('The {' . Plugin::NS_CALDAV . '}filter element is required for this request');
-        }
-
-        $obj = new self();
-        foreach ($newProps as $key => $value) {
-            $obj->$key = $value;
-        }
-        return $obj;
-
-    }
+	/**
+	 * An array with requested properties.
+	 *
+	 * @var array
+	 */
+	public $properties;
+
+	/**
+	 * List of property/component filters.
+	 *
+	 * @var array
+	 */
+	public $filters;
+
+	/**
+	 * If the calendar data must be expanded, this will contain an array with 2
+	 * elements: start and end.
+	 *
+	 * Each may be a DateTime or null.
+	 *
+	 * @var array|null
+	 */
+	public $expand = null;
+
+	/**
+	 * The mimetype of the content that should be returend. Usually
+	 * text/calendar.
+	 *
+	 * @var string
+	 */
+	public $contentType = null;
+
+	/**
+	 * The version of calendar-data that should be returned. Usually '2.0',
+	 * referring to iCalendar 2.0.
+	 *
+	 * @var string
+	 */
+	public $version = null;
+
+	/**
+	 * 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) {
+
+		$elems = $reader->parseInnerTree([
+			'{urn:ietf:params:xml:ns:caldav}comp-filter'   => 'Sabre\\CalDAV\\Xml\\Filter\\CompFilter',
+			'{urn:ietf:params:xml:ns:caldav}prop-filter'   => 'Sabre\\CalDAV\\Xml\\Filter\\PropFilter',
+			'{urn:ietf:params:xml:ns:caldav}param-filter'  => 'Sabre\\CalDAV\\Xml\\Filter\\ParamFilter',
+			'{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
+			'{DAV:}prop'                                   => 'Sabre\\Xml\\Element\\KeyValue',
+		]);
+
+		$newProps = [
+			'filters'    => null,
+			'properties' => [],
+		];
+
+		if (!is_array($elems)) $elems = [];
+
+		foreach ($elems as $elem) {
+
+			switch ($elem['name']) {
+
+				case '{DAV:}prop' :
+					$newProps['properties'] = array_keys($elem['value']);
+					if (isset($elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
+						$newProps += $elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'];
+					}
+					break;
+				case '{' . Plugin::NS_CALDAV . '}filter' :
+					foreach ($elem['value'] as $subElem) {
+						if ($subElem['name'] === '{' . Plugin::NS_CALDAV . '}comp-filter') {
+							if (!is_null($newProps['filters'])) {
+								throw new BadRequest('Only one top-level comp-filter may be defined');
+							}
+							$newProps['filters'] = $subElem['value'];
+						}
+					}
+					break;
+
+			}
+
+		}
+
+		if (is_null($newProps['filters'])) {
+			throw new BadRequest('The {' . Plugin::NS_CALDAV . '}filter element is required for this request');
+		}
+
+		$obj = new self();
+		foreach ($newProps as $key => $value) {
+			$obj->$key = $value;
+		}
+		return $obj;
+
+	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -97,7 +97,9 @@
             'properties' => [],
         ];
 
-        if (!is_array($elems)) $elems = [];
+        if (!is_array($elems)) {
+        	$elems = [];
+        }
 
         foreach ($elems as $elem) {
 

libraries/SabreDAV/CalDAV/Xml/Request/FreeBusyQueryReport.php

Doc Comments +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return FreeBusyQueryReport
      */
     static function xmlDeserialize(Reader $reader) {
 

Indentation +56 added lines, -56 removed lines

@@ -21,71 +21,71 @@
  */
 class FreeBusyQueryReport implements XmlDeserializable {
 
-    /**
-     * Starttime of report
-     *
-     * @var DateTime|null
-     */
-    public $start;
+	/**
+	 * Starttime of report
+	 *
+	 * @var DateTime|null
+	 */
+	public $start;
 
-    /**
-     * End time of report
-     *
-     * @var DateTime|null
-     */
-    public $end;
+	/**
+	 * End time of report
+	 *
+	 * @var DateTime|null
+	 */
+	public $end;
 
-    /**
-     * 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) {
+	/**
+	 * 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) {
 
-        $timeRange = '{' . Plugin::NS_CALDAV . '}time-range';
+		$timeRange = '{' . Plugin::NS_CALDAV . '}time-range';
 
-        $start = null;
-        $end = null;
+		$start = null;
+		$end = null;
 
-        foreach ((array)$reader->parseInnerTree([]) as $elem) {
+		foreach ((array)$reader->parseInnerTree([]) as $elem) {
 
-            if ($elem['name'] !== $timeRange) continue;
+			if ($elem['name'] !== $timeRange) continue;
 
-            $start = empty($elem['attributes']['start']) ?: $elem['attributes']['start'];
-            $end = empty($elem['attributes']['end']) ?: $elem['attributes']['end'];
+			$start = empty($elem['attributes']['start']) ?: $elem['attributes']['start'];
+			$end = empty($elem['attributes']['end']) ?: $elem['attributes']['end'];
 
-        }
-        if (!$start && !$end) {
-            throw new BadRequest('The freebusy report must have a time-range element');
-        }
-        if ($start) {
-            $start = DateTimeParser::parseDateTime($start);
-        }
-        if ($end) {
-            $end = DateTimeParser::parseDateTime($end);
-        }
-        $result = new self();
-        $result->start = $start;
-        $result->end = $end;
+		}
+		if (!$start && !$end) {
+			throw new BadRequest('The freebusy report must have a time-range element');
+		}
+		if ($start) {
+			$start = DateTimeParser::parseDateTime($start);
+		}
+		if ($end) {
+			$end = DateTimeParser::parseDateTime($end);
+		}
+		$result = new self();
+		$result->start = $start;
+		$result->end = $end;
 
-        return $result;
+		return $result;
 
-    }
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         $start = null;
         $end = null;
 
-        foreach ((array)$reader->parseInnerTree([]) as $elem) {
+        foreach ((array) $reader->parseInnerTree([]) as $elem) {
 
             if ($elem['name'] !== $timeRange) continue;
 

Braces +3 added lines, -1 removed lines

@@ -65,7 +65,9 @@
 
         foreach ((array)$reader->parseInnerTree([]) as $elem) {
 
-            if ($elem['name'] !== $timeRange) continue;
+            if ($elem['name'] !== $timeRange) {
+            	continue;
+            }
 
             $start = empty($elem['attributes']['start']) ?: $elem['attributes']['start'];
             $end = empty($elem['attributes']['end']) ?: $elem['attributes']['end'];

libraries/SabreDAV/CalDAV/Xml/Request/InviteReply.php

Doc Comments +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return InviteReply
      */
     static function xmlDeserialize(Reader $reader) {
 

Unused Use Statements +4 added lines, -4 removed lines

@@ -2,12 +2,12 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
-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;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\Xml\Element\KeyValue;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * Invite-reply POST request parser

Indentation +123 added lines, -123 removed lines

@@ -22,128 +22,128 @@
  */
 class InviteReply implements XmlDeserializable {
 
-    /**
-     * The sharee calendar user address.
-     *
-     * This is the address that the original invite was set to
-     *
-     * @var string
-     */
-    public $href;
-
-    /**
-     * The uri to the calendar that was being shared.
-     *
-     * @var string
-     */
-    public $calendarUri;
-
-    /**
-     * The id of the invite message that's being responded to
-     *
-     * @var string
-     */
-    public $inReplyTo;
-
-    /**
-     * An optional message
-     *
-     * @var string
-     */
-    public $summary;
-
-    /**
-     * Either SharingPlugin::STATUS_ACCEPTED or SharingPlugin::STATUS_DECLINED.
-     *
-     * @var int
-     */
-    public $status;
-
-    /**
-     * Constructor
-     *
-     * @param string $href
-     * @param string $calendarUri
-     * @param string $inReplyTo
-     * @param string $summary
-     * @param int $status
-     */
-    public function __construct($href, $calendarUri, $inReplyTo, $summary, $status) {
-
-        $this->href = $href;
-        $this->calendarUri = $calendarUri;
-        $this->inReplyTo = $inReplyTo;
-        $this->summary = $summary;
-        $this->status = $status;
-
-    }
-
-    /**
-     * 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) {
-
-        $elems = KeyValue::xmlDeserialize($reader);
-
-        $href = null;
-        $calendarUri = null;
-        $inReplyTo = null;
-        $summary = null;
-        $status = null;
-
-        foreach ($elems as $name => $value) {
-
-            switch ($name) {
-
-                case '{' . Plugin::NS_CALENDARSERVER . '}hosturl' :
-                    foreach ($value as $bla) {
-                        if ($bla['name'] === '{DAV:}href') {
-                            $calendarUri = $bla['value'];
-                        }
-                    }
-                    break;
-                case '{' . Plugin::NS_CALENDARSERVER . '}invite-accepted' :
-                    $status = SharingPlugin::STATUS_ACCEPTED;
-                    break;
-                case '{' . Plugin::NS_CALENDARSERVER . '}invite-declined' :
-                    $status = SharingPlugin::STATUS_DECLINED;
-                    break;
-                case '{' . Plugin::NS_CALENDARSERVER . '}in-reply-to' :
-                    $inReplyTo = $value;
-                    break;
-                case '{' . Plugin::NS_CALENDARSERVER . '}summary' :
-                    $summary = $value;
-                    break;
-                case '{DAV:}href' :
-                    $href = $value;
-                    break;
-            }
-
-        }
-        if (is_null($calendarUri)) {
-            throw new BadRequest('The {http://calendarserver.org/ns/}hosturl/{DAV:}href element must exist');
-        }
-
-        return new self($href, $calendarUri, $inReplyTo, $summary, $status);
-
-    }
+	/**
+	 * The sharee calendar user address.
+	 *
+	 * This is the address that the original invite was set to
+	 *
+	 * @var string
+	 */
+	public $href;
+
+	/**
+	 * The uri to the calendar that was being shared.
+	 *
+	 * @var string
+	 */
+	public $calendarUri;
+
+	/**
+	 * The id of the invite message that's being responded to
+	 *
+	 * @var string
+	 */
+	public $inReplyTo;
+
+	/**
+	 * An optional message
+	 *
+	 * @var string
+	 */
+	public $summary;
+
+	/**
+	 * Either SharingPlugin::STATUS_ACCEPTED or SharingPlugin::STATUS_DECLINED.
+	 *
+	 * @var int
+	 */
+	public $status;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $href
+	 * @param string $calendarUri
+	 * @param string $inReplyTo
+	 * @param string $summary
+	 * @param int $status
+	 */
+	public function __construct($href, $calendarUri, $inReplyTo, $summary, $status) {
+
+		$this->href = $href;
+		$this->calendarUri = $calendarUri;
+		$this->inReplyTo = $inReplyTo;
+		$this->summary = $summary;
+		$this->status = $status;
+
+	}
+
+	/**
+	 * 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) {
+
+		$elems = KeyValue::xmlDeserialize($reader);
+
+		$href = null;
+		$calendarUri = null;
+		$inReplyTo = null;
+		$summary = null;
+		$status = null;
+
+		foreach ($elems as $name => $value) {
+
+			switch ($name) {
+
+				case '{' . Plugin::NS_CALENDARSERVER . '}hosturl' :
+					foreach ($value as $bla) {
+						if ($bla['name'] === '{DAV:}href') {
+							$calendarUri = $bla['value'];
+						}
+					}
+					break;
+				case '{' . Plugin::NS_CALENDARSERVER . '}invite-accepted' :
+					$status = SharingPlugin::STATUS_ACCEPTED;
+					break;
+				case '{' . Plugin::NS_CALENDARSERVER . '}invite-declined' :
+					$status = SharingPlugin::STATUS_DECLINED;
+					break;
+				case '{' . Plugin::NS_CALENDARSERVER . '}in-reply-to' :
+					$inReplyTo = $value;
+					break;
+				case '{' . Plugin::NS_CALENDARSERVER . '}summary' :
+					$summary = $value;
+					break;
+				case '{DAV:}href' :
+					$href = $value;
+					break;
+			}
+
+		}
+		if (is_null($calendarUri)) {
+			throw new BadRequest('The {http://calendarserver.org/ns/}hosturl/{DAV:}href element must exist');
+		}
+
+		return new self($href, $calendarUri, $inReplyTo, $summary, $status);
+
+	}
 
 }