YetiForceCompany / YetiForceCRM

libraries/SabreDAV/VObject/Property/ICalendar/Duration.php

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

@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
-use Sabre\VObject\Property;
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\Property;
 
 /**
  * Duration property.

Indentation +63 added lines, -63 removed lines

@@ -18,68 +18,68 @@
  */
 class Duration extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = ',';
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue(explode($this->delimiter, $val));
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode($this->delimiter, $this->getParts());
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'DURATION';
-
-    }
-
-    /**
-     * Returns a DateInterval representation of the Duration property.
-     *
-     * If the property has more than one value, only the first is returned.
-     *
-     * @return \DateInterval
-     */
-    public function getDateInterval() {
-
-        $parts = $this->getParts();
-        $value = $parts[0];
-        return DateTimeParser::parseDuration($value);
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = ',';
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue(explode($this->delimiter, $val));
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return implode($this->delimiter, $this->getParts());
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'DURATION';
+
+	}
+
+	/**
+	 * Returns a DateInterval representation of the Duration property.
+	 *
+	 * If the property has more than one value, only the first is returned.
+	 *
+	 * @return \DateInterval
+	 */
+	public function getDateInterval() {
+
+		$parts = $this->getParts();
+		$value = $parts[0];
+		return DateTimeParser::parseDuration($value);
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/ICalendar/Period.php

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

@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
-use Sabre\VObject\Property;
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\Property;
 use Sabre\Xml;
 
 /**

Braces +1 added lines, -2 removed lines

@@ -143,8 +143,7 @@
 
         if ($value[0][1][0] === 'P') {
             $writer->writeElement('duration', $value[0][1]);
-        }
-        else {
+        } else {
             $writer->writeElement('end', $value[0][1]);
         }
 

Indentation +132 added lines, -132 removed lines

@@ -19,137 +19,137 @@
  */
 class Period extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = ',';
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue(explode($this->delimiter, $val));
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode($this->delimiter, $this->getParts());
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'PERIOD';
-
-    }
-
-    /**
-     * Sets the json value, as it would appear in a jCard or jCal object.
-     *
-     * The value must always be an array.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setJsonValue(array $value) {
-
-        $value = array_map(
-            function($item) {
-
-                return strtr(implode('/', $item), [':' => '', '-' => '']);
-
-            },
-            $value
-        );
-        parent::setJsonValue($value);
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $return = [];
-        foreach ($this->getParts() as $item) {
-
-            list($start, $end) = explode('/', $item, 2);
-
-            $start = DateTimeParser::parseDateTime($start);
-
-            // This is a duration value.
-            if ($end[0] === 'P') {
-                $return[] = [
-                    $start->format('Y-m-d\\TH:i:s'),
-                    $end
-                ];
-            } else {
-                $end = DateTimeParser::parseDateTime($end);
-                $return[] = [
-                    $start->format('Y-m-d\\TH:i:s'),
-                    $end->format('Y-m-d\\TH:i:s'),
-                ];
-            }
-
-        }
-
-        return $return;
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        $writer->startElement(strtolower($this->getValueType()));
-        $value = $this->getJsonValue();
-        $writer->writeElement('start', $value[0][0]);
-
-        if ($value[0][1][0] === 'P') {
-            $writer->writeElement('duration', $value[0][1]);
-        }
-        else {
-            $writer->writeElement('end', $value[0][1]);
-        }
-
-        $writer->endElement();
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = ',';
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue(explode($this->delimiter, $val));
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return implode($this->delimiter, $this->getParts());
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'PERIOD';
+
+	}
+
+	/**
+	 * Sets the json value, as it would appear in a jCard or jCal object.
+	 *
+	 * The value must always be an array.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setJsonValue(array $value) {
+
+		$value = array_map(
+			function($item) {
+
+				return strtr(implode('/', $item), [':' => '', '-' => '']);
+
+			},
+			$value
+		);
+		parent::setJsonValue($value);
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		$return = [];
+		foreach ($this->getParts() as $item) {
+
+			list($start, $end) = explode('/', $item, 2);
+
+			$start = DateTimeParser::parseDateTime($start);
+
+			// This is a duration value.
+			if ($end[0] === 'P') {
+				$return[] = [
+					$start->format('Y-m-d\\TH:i:s'),
+					$end
+				];
+			} else {
+				$end = DateTimeParser::parseDateTime($end);
+				$return[] = [
+					$start->format('Y-m-d\\TH:i:s'),
+					$end->format('Y-m-d\\TH:i:s'),
+				];
+			}
+
+		}
+
+		return $return;
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		$writer->startElement(strtolower($this->getValueType()));
+		$value = $this->getJsonValue();
+		$writer->writeElement('start', $value[0][0]);
+
+		if ($value[0][1][0] === 'P') {
+			$writer->writeElement('duration', $value[0][1]);
+		}
+		else {
+			$writer->writeElement('end', $value[0][1]);
+		}
+
+		$writer->endElement();
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/IntegerValue.php

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

@@ -2,8 +2,7 @@
 
 namespace Sabre\VObject\Property;
 
-use
-    Sabre\VObject\Property;
+use Sabre\VObject\Property;
 
 /**
  * Integer property.

Indentation +69 added lines, -69 removed lines

@@ -3,7 +3,7 @@ 
 namespace Sabre\VObject\Property;
 
 use
-    Sabre\VObject\Property;
+	Sabre\VObject\Property;
 
 /**
  * Integer property.
@@ -17,72 +17,72 @@ 
  */
 class IntegerValue extends Property {
 
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue((int)$val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'INTEGER';
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        return [(int)$this->getValue()];
-
-    }
-
-    /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
-     * object.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setXmlValue(array $value) {
-
-        $value = array_map('intval', $value);
-        parent::setXmlValue($value);
-
-    }
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue((int)$val);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return $this->value;
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'INTEGER';
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		return [(int)$this->getValue()];
+
+	}
+
+	/**
+	 * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+	 * object.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setXmlValue(array $value) {
+
+		$value = array_map('intval', $value);
+		parent::setXmlValue($value);
+
+	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      *
      * This method must always return an array.
      *
-     * @return array
+     * @return integer[]
      */
     public function getJsonValue() {
 

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function setRawMimeDirValue($val) {
 
-        $this->setValue((int)$val);
+        $this->setValue((int) $val);
 
     }
 
@@ -67,7 +67,7 @@ 
      */
     public function getJsonValue() {
 
-        return [(int)$this->getValue()];
+        return [(int) $this->getValue()];
 
     }
 

libraries/SabreDAV/VObject/Property/Text.php

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

@@ -2,10 +2,10 @@
 
 namespace Sabre\VObject\Property;
 
-use Sabre\VObject\Property;
 use Sabre\VObject\Component;
-use Sabre\VObject\Parser\MimeDir;
 use Sabre\VObject\Document;
+use Sabre\VObject\Parser\MimeDir;
+use Sabre\VObject\Property;
 use Sabre\Xml;
 
 /**

Spacing +2 added lines, -2 removed lines

@@ -252,7 +252,7 @@ 
             // encode newlines for us. Specifically, the \r\n sequence must in
             // vcards be encoded as =0D=OA and we must insert soft-newlines
             // every 75 bytes.
-            for ($ii = 0;$ii < strlen($val);$ii++) {
+            for ($ii = 0; $ii < strlen($val); $ii++) {
                 $ord = ord($val[$ii]);
                 // These characters are encoded as themselves.
                 if ($ord >= 32 && $ord <= 126) {
@@ -397,7 +397,7 @@ 
             if (count($parts) < $minimum) {
                 $warnings[] = [
                     'level'   => $options & self::REPAIR ? 1 : 3,
-                    'message' => 'The ' . $this->name  . ' property must have at least ' . $minimum . ' values. It only has ' . count($parts),
+                    'message' => 'The ' . $this->name . ' property must have at least ' . $minimum . ' values. It only has ' . count($parts),
                     'node'    => $this,
                 ];
                 if ($options & self::REPAIR) {

Braces +6 added lines, -2 removed lines

@@ -228,7 +228,9 @@ 
         }
 
         $str = $this->name;
-        if ($this->group) $str = $this->group . '.' . $this->name;
+        if ($this->group) {
+        	$str = $this->group . '.' . $this->name;
+        }
         foreach ($this->parameters as $param) {
 
             if ($param->getValue() === 'QUOTED-PRINTABLE') {
@@ -267,7 +269,9 @@ 
                 }
 
             }
-            if (!is_null($lastLine)) $out .= $lastLine . "\r\n";
+            if (!is_null($lastLine)) {
+            	$out .= $lastLine . "\r\n";
+            }
             return $out;
 
         } else {

Indentation +391 added lines, -391 removed lines

@@ -19,395 +19,395 @@
  */
 class Text extends Property {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string
-     */
-    public $delimiter = ',';
-
-    /**
-     * List of properties that are considered 'structured'.
-     *
-     * @var array
-     */
-    protected $structuredValues = [
-        // vCard
-        'N',
-        'ADR',
-        'ORG',
-        'GENDER',
-        'CLIENTPIDMAP',
-
-        // iCalendar
-        'REQUEST-STATUS',
-    ];
-
-    /**
-     * Some text components have a minimum number of components.
-     *
-     * N must for instance be represented as 5 components, separated by ;, even
-     * if the last few components are unused.
-     *
-     * @var array
-     */
-    protected $minimumPropertyValues = [
-        'N'   => 5,
-        'ADR' => 7,
-    ];
-
-    /**
-     * Creates the property.
-     *
-     * You can specify the parameters either in key=>value syntax, in which case
-     * parameters will automatically be created, or you can just pass a list of
-     * Parameter objects.
-     *
-     * @param Component $root The root document
-     * @param string $name
-     * @param string|array|null $value
-     * @param array $parameters List of parameters
-     * @param string $group The vcard property group
-     *
-     * @return void
-     */
-    public function __construct(Component $root, $name, $value = null, array $parameters = [], $group = null) {
-
-        // There's two types of multi-valued text properties:
-        // 1. multivalue properties.
-        // 2. structured value properties
-        //
-        // The former is always separated by a comma, the latter by semi-colon.
-        if (in_array($name, $this->structuredValues)) {
-            $this->delimiter = ';';
-        }
-
-        parent::__construct($root, $name, $value, $parameters, $group);
-
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue(MimeDir::unescapeValue($val, $this->delimiter));
-
-    }
-
-    /**
-     * Sets the value as a quoted-printable encoded string.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setQuotedPrintableValue($val) {
-
-        $val = quoted_printable_decode($val);
-
-        // Quoted printable only appears in vCard 2.1, and the only character
-        // that may be escaped there is ;. So we are simply splitting on just
-        // that.
-        //
-        // We also don't have to unescape \\, so all we need to look for is a ;
-        // that's not preceeded with a \.
-        $regex = '# (?<!\\\\) ; #x';
-        $matches = preg_split($regex, $val);
-        $this->setValue($matches);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        $val = $this->getParts();
-
-        if (isset($this->minimumPropertyValues[$this->name])) {
-            $val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
-        }
-
-        foreach ($val as &$item) {
-
-            if (!is_array($item)) {
-                $item = [$item];
-            }
-
-            foreach ($item as &$subItem) {
-                $subItem = strtr(
-                    $subItem,
-                    [
-                        '\\' => '\\\\',
-                        ';'  => '\;',
-                        ','  => '\,',
-                        "\n" => '\n',
-                        "\r" => "",
-                    ]
-                );
-            }
-            $item = implode(',', $item);
-
-        }
-
-        return implode($this->delimiter, $val);
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        // Structured text values should always be returned as a single
-        // array-item. Multi-value text should be returned as multiple items in
-        // the top-array.
-        if (in_array($this->name, $this->structuredValues)) {
-            return [$this->getParts()];
-        }
-        return $this->getParts();
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'TEXT';
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        // We need to kick in a special type of encoding, if it's a 2.1 vcard.
-        if ($this->root->getDocumentType() !== Document::VCARD21) {
-            return parent::serialize();
-        }
-
-        $val = $this->getParts();
-
-        if (isset($this->minimumPropertyValues[$this->name])) {
-            $val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
-        }
-
-        // Imploding multiple parts into a single value, and splitting the
-        // values with ;.
-        if (count($val) > 1) {
-            foreach ($val as $k => $v) {
-                $val[$k] = str_replace(';', '\;', $v);
-            }
-            $val = implode(';', $val);
-        } else {
-            $val = $val[0];
-        }
-
-        $str = $this->name;
-        if ($this->group) $str = $this->group . '.' . $this->name;
-        foreach ($this->parameters as $param) {
-
-            if ($param->getValue() === 'QUOTED-PRINTABLE') {
-                continue;
-            }
-            $str .= ';' . $param->serialize();
-
-        }
-
-
-
-        // If the resulting value contains a \n, we must encode it as
-        // quoted-printable.
-        if (strpos($val, "\n") !== false) {
-
-            $str .= ';ENCODING=QUOTED-PRINTABLE:';
-            $lastLine = $str;
-            $out = null;
-
-            // The PHP built-in quoted-printable-encode does not correctly
-            // encode newlines for us. Specifically, the \r\n sequence must in
-            // vcards be encoded as =0D=OA and we must insert soft-newlines
-            // every 75 bytes.
-            for ($ii = 0;$ii < strlen($val);$ii++) {
-                $ord = ord($val[$ii]);
-                // These characters are encoded as themselves.
-                if ($ord >= 32 && $ord <= 126) {
-                    $lastLine .= $val[$ii];
-                } else {
-                    $lastLine .= '=' . strtoupper(bin2hex($val[$ii]));
-                }
-                if (strlen($lastLine) >= 75) {
-                    // Soft line break
-                    $out .= $lastLine . "=\r\n ";
-                    $lastLine = null;
-                }
-
-            }
-            if (!is_null($lastLine)) $out .= $lastLine . "\r\n";
-            return $out;
-
-        } else {
-            $str .= ':' . $val;
-            $out = '';
-            while (strlen($str) > 0) {
-                if (strlen($str) > 75) {
-                    $out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n";
-                    $str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8');
-                } else {
-                    $out .= $str . "\r\n";
-                    $str = '';
-                    break;
-                }
-            }
-
-            return $out;
-
-        }
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        $values = $this->getParts();
-
-        $map = function($items) use ($values, $writer) {
-            foreach ($items as $i => $item) {
-                $writer->writeElement(
-                    $item,
-                    !empty($values[$i]) ? $values[$i] : null
-                );
-            }
-        };
-
-        switch ($this->name) {
-
-            // Special-casing the REQUEST-STATUS property.
-            //
-            // See:
-            // http://tools.ietf.org/html/rfc6321#section-3.4.1.3
-            case 'REQUEST-STATUS':
-                $writer->writeElement('code', $values[0]);
-                $writer->writeElement('description', $values[1]);
-
-                if (isset($values[2])) {
-                    $writer->writeElement('data', $values[2]);
-                }
-                break;
-
-            case 'N':
-                $map([
-                    'surname',
-                    'given',
-                    'additional',
-                    'prefix',
-                    'suffix'
-                ]);
-                break;
-
-            case 'GENDER':
-                $map([
-                    'sex',
-                    'text'
-                ]);
-                break;
-
-            case 'ADR':
-                $map([
-                    'pobox',
-                    'ext',
-                    'street',
-                    'locality',
-                    'region',
-                    'code',
-                    'country'
-                ]);
-                break;
-
-            case 'CLIENTPIDMAP':
-                $map([
-                    'sourceid',
-                    'uri'
-                ]);
-                break;
-
-            default:
-                parent::xmlSerializeValue($writer);
-        }
-
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   - Node::REPAIR - If something is broken, and automatic repair may
-     *                    be attempted.
-     *
-     * An array is returned with warnings.
-     *
-     * Every item in the array has the following properties:
-     *    * level - (number between 1 and 3 with severity information)
-     *    * message - (human readable message)
-     *    * node - (reference to the offending node)
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $warnings = parent::validate($options);
-
-        if (isset($this->minimumPropertyValues[$this->name])) {
-
-            $minimum = $this->minimumPropertyValues[$this->name];
-            $parts = $this->getParts();
-            if (count($parts) < $minimum) {
-                $warnings[] = [
-                    'level'   => $options & self::REPAIR ? 1 : 3,
-                    'message' => 'The ' . $this->name  . ' property must have at least ' . $minimum . ' values. It only has ' . count($parts),
-                    'node'    => $this,
-                ];
-                if ($options & self::REPAIR) {
-                    $parts = array_pad($parts, $minimum, '');
-                    $this->setParts($parts);
-                }
-            }
-
-        }
-        return $warnings;
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string
+	 */
+	public $delimiter = ',';
+
+	/**
+	 * List of properties that are considered 'structured'.
+	 *
+	 * @var array
+	 */
+	protected $structuredValues = [
+		// vCard
+		'N',
+		'ADR',
+		'ORG',
+		'GENDER',
+		'CLIENTPIDMAP',
+
+		// iCalendar
+		'REQUEST-STATUS',
+	];
+
+	/**
+	 * Some text components have a minimum number of components.
+	 *
+	 * N must for instance be represented as 5 components, separated by ;, even
+	 * if the last few components are unused.
+	 *
+	 * @var array
+	 */
+	protected $minimumPropertyValues = [
+		'N'   => 5,
+		'ADR' => 7,
+	];
+
+	/**
+	 * Creates the property.
+	 *
+	 * You can specify the parameters either in key=>value syntax, in which case
+	 * parameters will automatically be created, or you can just pass a list of
+	 * Parameter objects.
+	 *
+	 * @param Component $root The root document
+	 * @param string $name
+	 * @param string|array|null $value
+	 * @param array $parameters List of parameters
+	 * @param string $group The vcard property group
+	 *
+	 * @return void
+	 */
+	public function __construct(Component $root, $name, $value = null, array $parameters = [], $group = null) {
+
+		// There's two types of multi-valued text properties:
+		// 1. multivalue properties.
+		// 2. structured value properties
+		//
+		// The former is always separated by a comma, the latter by semi-colon.
+		if (in_array($name, $this->structuredValues)) {
+			$this->delimiter = ';';
+		}
+
+		parent::__construct($root, $name, $value, $parameters, $group);
+
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue(MimeDir::unescapeValue($val, $this->delimiter));
+
+	}
+
+	/**
+	 * Sets the value as a quoted-printable encoded string.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setQuotedPrintableValue($val) {
+
+		$val = quoted_printable_decode($val);
+
+		// Quoted printable only appears in vCard 2.1, and the only character
+		// that may be escaped there is ;. So we are simply splitting on just
+		// that.
+		//
+		// We also don't have to unescape \\, so all we need to look for is a ;
+		// that's not preceeded with a \.
+		$regex = '# (?<!\\\\) ; #x';
+		$matches = preg_split($regex, $val);
+		$this->setValue($matches);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		$val = $this->getParts();
+
+		if (isset($this->minimumPropertyValues[$this->name])) {
+			$val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
+		}
+
+		foreach ($val as &$item) {
+
+			if (!is_array($item)) {
+				$item = [$item];
+			}
+
+			foreach ($item as &$subItem) {
+				$subItem = strtr(
+					$subItem,
+					[
+						'\\' => '\\\\',
+						';'  => '\;',
+						','  => '\,',
+						"\n" => '\n',
+						"\r" => "",
+					]
+				);
+			}
+			$item = implode(',', $item);
+
+		}
+
+		return implode($this->delimiter, $val);
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		// Structured text values should always be returned as a single
+		// array-item. Multi-value text should be returned as multiple items in
+		// the top-array.
+		if (in_array($this->name, $this->structuredValues)) {
+			return [$this->getParts()];
+		}
+		return $this->getParts();
+
+	}
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'TEXT';
+
+	}
+
+	/**
+	 * Turns the object back into a serialized blob.
+	 *
+	 * @return string
+	 */
+	public function serialize() {
+
+		// We need to kick in a special type of encoding, if it's a 2.1 vcard.
+		if ($this->root->getDocumentType() !== Document::VCARD21) {
+			return parent::serialize();
+		}
+
+		$val = $this->getParts();
+
+		if (isset($this->minimumPropertyValues[$this->name])) {
+			$val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
+		}
+
+		// Imploding multiple parts into a single value, and splitting the
+		// values with ;.
+		if (count($val) > 1) {
+			foreach ($val as $k => $v) {
+				$val[$k] = str_replace(';', '\;', $v);
+			}
+			$val = implode(';', $val);
+		} else {
+			$val = $val[0];
+		}
+
+		$str = $this->name;
+		if ($this->group) $str = $this->group . '.' . $this->name;
+		foreach ($this->parameters as $param) {
+
+			if ($param->getValue() === 'QUOTED-PRINTABLE') {
+				continue;
+			}
+			$str .= ';' . $param->serialize();
+
+		}
+
+
+
+		// If the resulting value contains a \n, we must encode it as
+		// quoted-printable.
+		if (strpos($val, "\n") !== false) {
+
+			$str .= ';ENCODING=QUOTED-PRINTABLE:';
+			$lastLine = $str;
+			$out = null;
+
+			// The PHP built-in quoted-printable-encode does not correctly
+			// encode newlines for us. Specifically, the \r\n sequence must in
+			// vcards be encoded as =0D=OA and we must insert soft-newlines
+			// every 75 bytes.
+			for ($ii = 0;$ii < strlen($val);$ii++) {
+				$ord = ord($val[$ii]);
+				// These characters are encoded as themselves.
+				if ($ord >= 32 && $ord <= 126) {
+					$lastLine .= $val[$ii];
+				} else {
+					$lastLine .= '=' . strtoupper(bin2hex($val[$ii]));
+				}
+				if (strlen($lastLine) >= 75) {
+					// Soft line break
+					$out .= $lastLine . "=\r\n ";
+					$lastLine = null;
+				}
+
+			}
+			if (!is_null($lastLine)) $out .= $lastLine . "\r\n";
+			return $out;
+
+		} else {
+			$str .= ':' . $val;
+			$out = '';
+			while (strlen($str) > 0) {
+				if (strlen($str) > 75) {
+					$out .= mb_strcut($str, 0, 75, 'utf-8') . "\r\n";
+					$str = ' ' . mb_strcut($str, 75, strlen($str), 'utf-8');
+				} else {
+					$out .= $str . "\r\n";
+					$str = '';
+					break;
+				}
+			}
+
+			return $out;
+
+		}
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		$values = $this->getParts();
+
+		$map = function($items) use ($values, $writer) {
+			foreach ($items as $i => $item) {
+				$writer->writeElement(
+					$item,
+					!empty($values[$i]) ? $values[$i] : null
+				);
+			}
+		};
+
+		switch ($this->name) {
+
+			// Special-casing the REQUEST-STATUS property.
+			//
+			// See:
+			// http://tools.ietf.org/html/rfc6321#section-3.4.1.3
+			case 'REQUEST-STATUS':
+				$writer->writeElement('code', $values[0]);
+				$writer->writeElement('description', $values[1]);
+
+				if (isset($values[2])) {
+					$writer->writeElement('data', $values[2]);
+				}
+				break;
+
+			case 'N':
+				$map([
+					'surname',
+					'given',
+					'additional',
+					'prefix',
+					'suffix'
+				]);
+				break;
+
+			case 'GENDER':
+				$map([
+					'sex',
+					'text'
+				]);
+				break;
+
+			case 'ADR':
+				$map([
+					'pobox',
+					'ext',
+					'street',
+					'locality',
+					'region',
+					'code',
+					'country'
+				]);
+				break;
+
+			case 'CLIENTPIDMAP':
+				$map([
+					'sourceid',
+					'uri'
+				]);
+				break;
+
+			default:
+				parent::xmlSerializeValue($writer);
+		}
+
+	}
+
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   - Node::REPAIR - If something is broken, and automatic repair may
+	 *                    be attempted.
+	 *
+	 * An array is returned with warnings.
+	 *
+	 * Every item in the array has the following properties:
+	 *    * level - (number between 1 and 3 with severity information)
+	 *    * message - (human readable message)
+	 *    * node - (reference to the offending node)
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0) {
+
+		$warnings = parent::validate($options);
+
+		if (isset($this->minimumPropertyValues[$this->name])) {
+
+			$minimum = $this->minimumPropertyValues[$this->name];
+			$parts = $this->getParts();
+			if (count($parts) < $minimum) {
+				$warnings[] = [
+					'level'   => $options & self::REPAIR ? 1 : 3,
+					'message' => 'The ' . $this->name  . ' property must have at least ' . $minimum . ' values. It only has ' . count($parts),
+					'node'    => $this,
+				];
+				if ($options & self::REPAIR) {
+					$parts = array_pad($parts, $minimum, '');
+					$this->setParts($parts);
+				}
+			}
+
+		}
+		return $warnings;
+
+	}
 }

libraries/SabreDAV/VObject/Property/Uri.php

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

@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Property;
 
-use Sabre\VObject\Property;
 use Sabre\VObject\Parameter;
+use Sabre\VObject\Property;
 
 /**
  * URI property.

Indentation +102 added lines, -102 removed lines

@@ -16,107 +16,107 @@
  */
 class Uri extends Text {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = null;
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'URI';
-
-    }
-
-    /**
-     * Returns an iterable list of children.
-     *
-     * @return array
-     */
-    public function parameters() {
-
-        $parameters = parent::parameters();
-        if (!isset($parameters['VALUE']) && in_array($this->name, ['URL', 'PHOTO'])) {
-            // If we are encoding a URI value, and this URI value has no
-            // VALUE=URI parameter, we add it anyway.
-            //
-            // This is not required by any spec, but both Apple iCal and Apple
-            // AddressBook (at least in version 10.8) will trip over this if
-            // this is not set, and so it improves compatibility.
-            //
-            // See Issue #227 and #235
-            $parameters['VALUE'] = new Parameter($this->root, 'VALUE', 'URI');
-        }
-        return $parameters;
-
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        // Normally we don't need to do any type of unescaping for these
-        // properties, however.. we've noticed that Google Contacts
-        // specifically escapes the colon (:) with a blackslash. While I have
-        // no clue why they thought that was a good idea, I'm unescaping it
-        // anyway.
-        //
-        // Good thing backslashes are not allowed in urls. Makes it easy to
-        // assume that a backslash is always intended as an escape character.
-        if ($this->name === 'URL') {
-            $regex = '#  (?: (\\\\ (?: \\\\ | : ) ) ) #x';
-            $matches = preg_split($regex, $val, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-            $newVal = '';
-            foreach ($matches as $match) {
-                switch ($match) {
-                    case '\:' :
-                        $newVal .= ':';
-                        break;
-                    default :
-                        $newVal .= $match;
-                        break;
-                }
-            }
-            $this->value = $newVal;
-        } else {
-            $this->value = strtr($val, ['\,' => ',']);
-        }
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        if (is_array($this->value)) {
-            $value = $this->value[0];
-        } else {
-            $value = $this->value;
-        }
-
-        return strtr($value, [',' => '\,']);
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = null;
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'URI';
+
+	}
+
+	/**
+	 * Returns an iterable list of children.
+	 *
+	 * @return array
+	 */
+	public function parameters() {
+
+		$parameters = parent::parameters();
+		if (!isset($parameters['VALUE']) && in_array($this->name, ['URL', 'PHOTO'])) {
+			// If we are encoding a URI value, and this URI value has no
+			// VALUE=URI parameter, we add it anyway.
+			//
+			// This is not required by any spec, but both Apple iCal and Apple
+			// AddressBook (at least in version 10.8) will trip over this if
+			// this is not set, and so it improves compatibility.
+			//
+			// See Issue #227 and #235
+			$parameters['VALUE'] = new Parameter($this->root, 'VALUE', 'URI');
+		}
+		return $parameters;
+
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		// Normally we don't need to do any type of unescaping for these
+		// properties, however.. we've noticed that Google Contacts
+		// specifically escapes the colon (:) with a blackslash. While I have
+		// no clue why they thought that was a good idea, I'm unescaping it
+		// anyway.
+		//
+		// Good thing backslashes are not allowed in urls. Makes it easy to
+		// assume that a backslash is always intended as an escape character.
+		if ($this->name === 'URL') {
+			$regex = '#  (?: (\\\\ (?: \\\\ | : ) ) ) #x';
+			$matches = preg_split($regex, $val, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+			$newVal = '';
+			foreach ($matches as $match) {
+				switch ($match) {
+					case '\:' :
+						$newVal .= ':';
+						break;
+					default :
+						$newVal .= $match;
+						break;
+				}
+			}
+			$this->value = $newVal;
+		} else {
+			$this->value = strtr($val, ['\,' => ',']);
+		}
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		if (is_array($this->value)) {
+			$value = $this->value[0];
+		} else {
+			$value = $this->value;
+		}
+
+		return strtr($value, [',' => '\,']);
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/VCard/DateAndOrTime.php

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

@@ -2,9 +2,9 @@
 
 namespace Sabre\VObject\Property\VCard;
 
-use DateTimeInterface;
-use DateTimeImmutable;
 use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property;

Spacing +3 added lines, -3 removed lines

@@ -278,7 +278,7 @@ 
         // value-date = element date {
         //     xsd:string { pattern = "\d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d" }
         //   }
-        if (($d('year') ||  $d('month')  ||  $d('date'))
+        if (($d('year') || $d('month') || $d('date'))
             && (!$d('hour') && !$d('minute') && !$d('second') && !$d('timezone'))) {
 
             if ($d('year') && $d('month') && $d('date')) {
@@ -296,8 +296,8 @@ 
         //     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
         //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
         //   }
-        } elseif ((!$d('year') && !$d('month')  && !$d('date'))
-                  && ($d('hour') ||  $d('minute') ||  $d('second'))) {
+        } elseif ((!$d('year') && !$d('month') && !$d('date'))
+                  && ($d('hour') || $d('minute') || $d('second'))) {
 
             if ($d('hour')) {
                 $value .= $r('hour') . $r('minute') . $r('second');

Indentation +379 added lines, -379 removed lines

@@ -21,383 +21,383 @@
  */
 class DateAndOrTime extends Property {
 
-    /**
-     * Field separator.
-     *
-     * @var null|string
-     */
-    public $delimiter = null;
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'DATE-AND-OR-TIME';
-
-    }
-
-    /**
-     * Sets a multi-valued property.
-     *
-     * You may also specify DateTime objects here.
-     *
-     * @param array $parts
-     *
-     * @return void
-     */
-    public function setParts(array $parts) {
-
-        if (count($parts) > 1) {
-            throw new \InvalidArgumentException('Only one value allowed');
-        }
-        if (isset($parts[0]) && $parts[0] instanceof \DateTime) {
-            $this->setDateTime($parts[0]);
-        } else {
-            parent::setParts($parts);
-        }
-
-    }
-
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * Instead of strings, you may also use DateTime here.
-     *
-     * @param string|array|\DateTime $value
-     *
-     * @return void
-     */
-    public function setValue($value) {
-
-        if ($value instanceof \DateTime) {
-            $this->setDateTime($value);
-        } else {
-            parent::setValue($value);
-        }
-
-    }
-
-    /**
-     * Sets the property as a DateTime object.
-     *
-     * @param DateTimeInterface $dt
-     *
-     * @return void
-     */
-    public function setDateTime(DateTimeInterface $dt) {
-
-        $tz = $dt->getTimeZone();
-        $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
-
-        if ($isUtc) {
-            $value = $dt->format('Ymd\\THis\\Z');
-        } else {
-            // Calculating the offset.
-            $value = $dt->format('Ymd\\THisO');
-        }
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns a date-time value.
-     *
-     * Note that if this property contained more than 1 date-time, only the
-     * first will be returned. To get an array with multiple values, call
-     * getDateTimes.
-     *
-     * If no time was specified, we will always use midnight (in the default
-     * timezone) as the time.
-     *
-     * If parts of the date were omitted, such as the year, we will grab the
-     * current values for those. So at the time of writing, if the year was
-     * omitted, we would have filled in 2014.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDateTime() {
-
-        $now = new DateTime();
-
-        $tzFormat = $now->getTimezone()->getOffset($now) === 0 ? '\\Z' : 'O';
-        $nowParts = DateTimeParser::parseVCardDateTime($now->format('Ymd\\This' . $tzFormat));
-
-        $dateParts = DateTimeParser::parseVCardDateTime($this->getValue());
-
-        // This sets all the missing parts to the current date/time.
-        // So if the year was missing for a birthday, we're making it 'this
-        // year'.
-        foreach ($dateParts as $k => $v) {
-            if (is_null($v)) {
-                $dateParts[$k] = $nowParts[$k];
-            }
-        }
-        return new DateTimeImmutable("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $parts = DateTimeParser::parseVCardDateTime($this->getValue());
-
-        $dateStr = '';
-
-        // Year
-        if (!is_null($parts['year'])) {
-
-            $dateStr .= $parts['year'];
-
-            if (!is_null($parts['month'])) {
-                // If a year and a month is set, we need to insert a separator
-                // dash.
-                $dateStr .= '-';
-            }
-
-        } else {
-
-            if (!is_null($parts['month']) || !is_null($parts['date'])) {
-                // Inserting two dashes
-                $dateStr .= '--';
-            }
-
-        }
-
-        // Month
-        if (!is_null($parts['month'])) {
-
-            $dateStr .= $parts['month'];
-
-            if (isset($parts['date'])) {
-                // If month and date are set, we need the separator dash.
-                $dateStr .= '-';
-            }
-
-        } elseif (isset($parts['date'])) {
-            // If the month is empty, and a date is set, we need a 'empty
-            // dash'
-            $dateStr .= '-';
-        }
-
-        // Date
-        if (!is_null($parts['date'])) {
-            $dateStr .= $parts['date'];
-        }
-
-
-        // Early exit if we don't have a time string.
-        if (is_null($parts['hour']) && is_null($parts['minute']) && is_null($parts['second'])) {
-            return [$dateStr];
-        }
-
-        $dateStr .= 'T';
-
-        // Hour
-        if (!is_null($parts['hour'])) {
-
-            $dateStr .= $parts['hour'];
-
-            if (!is_null($parts['minute'])) {
-                $dateStr .= ':';
-            }
-
-        } else {
-            // We know either minute or second _must_ be set, so we insert a
-            // dash for an empty value.
-            $dateStr .= '-';
-        }
-
-        // Minute
-        if (!is_null($parts['minute'])) {
-
-            $dateStr .= $parts['minute'];
-
-            if (!is_null($parts['second'])) {
-                $dateStr .= ':';
-            }
-
-        } elseif (isset($parts['second'])) {
-            // Dash for empty minute
-            $dateStr .= '-';
-        }
-
-        // Second
-        if (!is_null($parts['second'])) {
-            $dateStr .= $parts['second'];
-        }
-
-        // Timezone
-        if (!is_null($parts['timezone'])) {
-            $dateStr .= $parts['timezone'];
-        }
-
-        return [$dateStr];
-
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer  XML writer.
-     *
-     * @return void
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer) {
-
-        $valueType = strtolower($this->getValueType());
-        $parts     = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
-        $value     = '';
-
-        $d = function($part) use ($parts) {
-            return !is_null($parts[$part]);
-        };
-
-        $r = function($part) use ($parts) {
-            return $parts[$part];
-        };
-
-        // From the Relax NG Schema.
-        //
-        // # 4.3.1
-        // value-date = element date {
-        //     xsd:string { pattern = "\d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d" }
-        //   }
-        if (($d('year') ||  $d('month')  ||  $d('date'))
-            && (!$d('hour') && !$d('minute') && !$d('second') && !$d('timezone'))) {
-
-            if ($d('year') && $d('month') && $d('date')) {
-                $value .= $r('year') . $r('month') . $r('date');
-            } elseif ($d('year') && $d('month') && !$d('date')) {
-                $value .= $r('year') . '-' . $r('month');
-            } elseif (!$d('year') && $d('month')) {
-                $value .= '--' . $r('month') . $r('date');
-            } elseif (!$d('year') && !$d('month') && $d('date')) {
-                $value .= '---' . $r('date');
-            }
-
-        // # 4.3.2
-        // value-time = element time {
-        //     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
-        //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
-        //   }
-        } elseif ((!$d('year') && !$d('month')  && !$d('date'))
-                  && ($d('hour') ||  $d('minute') ||  $d('second'))) {
-
-            if ($d('hour')) {
-                $value .= $r('hour') . $r('minute') . $r('second');
-            } elseif ($d('minute')) {
-                $value .= '-' . $r('minute') . $r('second');
-            } elseif ($d('second')) {
-                $value .= '--' . $r('second');
-            }
-
-            $value .= $r('timezone');
-
-        // # 4.3.3
-        // value-date-time = element date-time {
-        //     xsd:string { pattern = "(\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?"
-        //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
-        //   }
-        } elseif ($d('date') && $d('hour')) {
-
-            if ($d('year') && $d('month') && $d('date')) {
-                $value .= $r('year') . $r('month') . $r('date');
-            } elseif (!$d('year') && $d('month') && $d('date')) {
-                $value .= '--' . $r('month') . $r('date');
-            } elseif (!$d('year') && !$d('month') && $d('date')) {
-                $value .= '---' . $r('date');
-            }
-
-            $value .= 'T' . $r('hour') . $r('minute') . $r('second') .
-                      $r('timezone');
-
-        }
-
-        $writer->writeElement($valueType, $value);
-
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue($val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode($this->delimiter, $this->getParts());
-
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   Node::REPAIR - May attempt to automatically repair the problem.
-     *
-     * This method returns an array with detected problems.
-     * Every element has the following properties:
-     *
-     *  * level - problem level.
-     *  * message - A human-readable string describing the issue.
-     *  * node - A reference to the problematic node.
-     *
-     * The level means:
-     *   1 - The issue was repaired (only happens if REPAIR was turned on)
-     *   2 - An inconsequential issue
-     *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $messages = parent::validate($options);
-        $value = $this->getValue();
-
-        try {
-            DateTimeParser::parseVCardDateTime($value);
-        } catch (InvalidDataException $e) {
-            $messages[] = [
-                'level'   => 3,
-                'message' => 'The supplied value (' . $value . ') is not a correct DATE-AND-OR-TIME property',
-                'node'    => $this,
-            ];
-        }
-
-        return $messages;
-
-    }
+	/**
+	 * Field separator.
+	 *
+	 * @var null|string
+	 */
+	public $delimiter = null;
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'DATE-AND-OR-TIME';
+
+	}
+
+	/**
+	 * Sets a multi-valued property.
+	 *
+	 * You may also specify DateTime objects here.
+	 *
+	 * @param array $parts
+	 *
+	 * @return void
+	 */
+	public function setParts(array $parts) {
+
+		if (count($parts) > 1) {
+			throw new \InvalidArgumentException('Only one value allowed');
+		}
+		if (isset($parts[0]) && $parts[0] instanceof \DateTime) {
+			$this->setDateTime($parts[0]);
+		} else {
+			parent::setParts($parts);
+		}
+
+	}
+
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * Instead of strings, you may also use DateTime here.
+	 *
+	 * @param string|array|\DateTime $value
+	 *
+	 * @return void
+	 */
+	public function setValue($value) {
+
+		if ($value instanceof \DateTime) {
+			$this->setDateTime($value);
+		} else {
+			parent::setValue($value);
+		}
+
+	}
+
+	/**
+	 * Sets the property as a DateTime object.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return void
+	 */
+	public function setDateTime(DateTimeInterface $dt) {
+
+		$tz = $dt->getTimeZone();
+		$isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
+
+		if ($isUtc) {
+			$value = $dt->format('Ymd\\THis\\Z');
+		} else {
+			// Calculating the offset.
+			$value = $dt->format('Ymd\\THisO');
+		}
+
+		$this->value = $value;
+
+	}
+
+	/**
+	 * Returns a date-time value.
+	 *
+	 * Note that if this property contained more than 1 date-time, only the
+	 * first will be returned. To get an array with multiple values, call
+	 * getDateTimes.
+	 *
+	 * If no time was specified, we will always use midnight (in the default
+	 * timezone) as the time.
+	 *
+	 * If parts of the date were omitted, such as the year, we will grab the
+	 * current values for those. So at the time of writing, if the year was
+	 * omitted, we would have filled in 2014.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDateTime() {
+
+		$now = new DateTime();
+
+		$tzFormat = $now->getTimezone()->getOffset($now) === 0 ? '\\Z' : 'O';
+		$nowParts = DateTimeParser::parseVCardDateTime($now->format('Ymd\\This' . $tzFormat));
+
+		$dateParts = DateTimeParser::parseVCardDateTime($this->getValue());
+
+		// This sets all the missing parts to the current date/time.
+		// So if the year was missing for a birthday, we're making it 'this
+		// year'.
+		foreach ($dateParts as $k => $v) {
+			if (is_null($v)) {
+				$dateParts[$k] = $nowParts[$k];
+			}
+		}
+		return new DateTimeImmutable("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
+
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue() {
+
+		$parts = DateTimeParser::parseVCardDateTime($this->getValue());
+
+		$dateStr = '';
+
+		// Year
+		if (!is_null($parts['year'])) {
+
+			$dateStr .= $parts['year'];
+
+			if (!is_null($parts['month'])) {
+				// If a year and a month is set, we need to insert a separator
+				// dash.
+				$dateStr .= '-';
+			}
+
+		} else {
+
+			if (!is_null($parts['month']) || !is_null($parts['date'])) {
+				// Inserting two dashes
+				$dateStr .= '--';
+			}
+
+		}
+
+		// Month
+		if (!is_null($parts['month'])) {
+
+			$dateStr .= $parts['month'];
+
+			if (isset($parts['date'])) {
+				// If month and date are set, we need the separator dash.
+				$dateStr .= '-';
+			}
+
+		} elseif (isset($parts['date'])) {
+			// If the month is empty, and a date is set, we need a 'empty
+			// dash'
+			$dateStr .= '-';
+		}
+
+		// Date
+		if (!is_null($parts['date'])) {
+			$dateStr .= $parts['date'];
+		}
+
+
+		// Early exit if we don't have a time string.
+		if (is_null($parts['hour']) && is_null($parts['minute']) && is_null($parts['second'])) {
+			return [$dateStr];
+		}
+
+		$dateStr .= 'T';
+
+		// Hour
+		if (!is_null($parts['hour'])) {
+
+			$dateStr .= $parts['hour'];
+
+			if (!is_null($parts['minute'])) {
+				$dateStr .= ':';
+			}
+
+		} else {
+			// We know either minute or second _must_ be set, so we insert a
+			// dash for an empty value.
+			$dateStr .= '-';
+		}
+
+		// Minute
+		if (!is_null($parts['minute'])) {
+
+			$dateStr .= $parts['minute'];
+
+			if (!is_null($parts['second'])) {
+				$dateStr .= ':';
+			}
+
+		} elseif (isset($parts['second'])) {
+			// Dash for empty minute
+			$dateStr .= '-';
+		}
+
+		// Second
+		if (!is_null($parts['second'])) {
+			$dateStr .= $parts['second'];
+		}
+
+		// Timezone
+		if (!is_null($parts['timezone'])) {
+			$dateStr .= $parts['timezone'];
+		}
+
+		return [$dateStr];
+
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer  XML writer.
+	 *
+	 * @return void
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer) {
+
+		$valueType = strtolower($this->getValueType());
+		$parts     = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
+		$value     = '';
+
+		$d = function($part) use ($parts) {
+			return !is_null($parts[$part]);
+		};
+
+		$r = function($part) use ($parts) {
+			return $parts[$part];
+		};
+
+		// From the Relax NG Schema.
+		//
+		// # 4.3.1
+		// value-date = element date {
+		//     xsd:string { pattern = "\d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d" }
+		//   }
+		if (($d('year') ||  $d('month')  ||  $d('date'))
+			&& (!$d('hour') && !$d('minute') && !$d('second') && !$d('timezone'))) {
+
+			if ($d('year') && $d('month') && $d('date')) {
+				$value .= $r('year') . $r('month') . $r('date');
+			} elseif ($d('year') && $d('month') && !$d('date')) {
+				$value .= $r('year') . '-' . $r('month');
+			} elseif (!$d('year') && $d('month')) {
+				$value .= '--' . $r('month') . $r('date');
+			} elseif (!$d('year') && !$d('month') && $d('date')) {
+				$value .= '---' . $r('date');
+			}
+
+		// # 4.3.2
+		// value-time = element time {
+		//     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
+		//                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
+		//   }
+		} elseif ((!$d('year') && !$d('month')  && !$d('date'))
+				  && ($d('hour') ||  $d('minute') ||  $d('second'))) {
+
+			if ($d('hour')) {
+				$value .= $r('hour') . $r('minute') . $r('second');
+			} elseif ($d('minute')) {
+				$value .= '-' . $r('minute') . $r('second');
+			} elseif ($d('second')) {
+				$value .= '--' . $r('second');
+			}
+
+			$value .= $r('timezone');
+
+		// # 4.3.3
+		// value-date-time = element date-time {
+		//     xsd:string { pattern = "(\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?"
+		//                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
+		//   }
+		} elseif ($d('date') && $d('hour')) {
+
+			if ($d('year') && $d('month') && $d('date')) {
+				$value .= $r('year') . $r('month') . $r('date');
+			} elseif (!$d('year') && $d('month') && $d('date')) {
+				$value .= '--' . $r('month') . $r('date');
+			} elseif (!$d('year') && !$d('month') && $d('date')) {
+				$value .= '---' . $r('date');
+			}
+
+			$value .= 'T' . $r('hour') . $r('minute') . $r('second') .
+					  $r('timezone');
+
+		}
+
+		$writer->writeElement($valueType, $value);
+
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		$this->setValue($val);
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		return implode($this->delimiter, $this->getParts());
+
+	}
+
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   Node::REPAIR - May attempt to automatically repair the problem.
+	 *
+	 * This method returns an array with detected problems.
+	 * Every element has the following properties:
+	 *
+	 *  * level - problem level.
+	 *  * message - A human-readable string describing the issue.
+	 *  * node - A reference to the problematic node.
+	 *
+	 * The level means:
+	 *   1 - The issue was repaired (only happens if REPAIR was turned on)
+	 *   2 - An inconsequential issue
+	 *   3 - A severe issue.
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0) {
+
+		$messages = parent::validate($options);
+		$value = $this->getValue();
+
+		try {
+			DateTimeParser::parseVCardDateTime($value);
+		} catch (InvalidDataException $e) {
+			$messages[] = [
+				'level'   => 3,
+				'message' => 'The supplied value (' . $value . ') is not a correct DATE-AND-OR-TIME property',
+				'node'    => $this,
+			];
+		}
+
+		return $messages;
+
+	}
 }

Doc Comments +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
      *
      * Instead of strings, you may also use DateTime here.
      *
-     * @param string|array|\DateTime $value
+     * @param string $value
      *
      * @return void
      */
@@ -150,7 +150,7 @@ 
      *
      * This method must always return an array.
      *
-     * @return array
+     * @return string[]
      */
     public function getJsonValue() {
 

libraries/SabreDAV/VObject/Recur/EventIterator.php

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

@@ -2,9 +2,9 @@
 
 namespace Sabre\VObject\Recur;
 
-use DateTimeZone;
 use DateTimeImmutable;
 use DateTimeInterface;
+use DateTimeZone;
 use InvalidArgumentException;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VEvent;

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             $events = [$input];
         } else {
             // Calendar + UID mode.
-            $uid = (string)$uid;
+            $uid = (string) $uid;
             if (!$uid) {
                 throw new InvalidArgumentException('The UID argument is required when a VCALENDAR is passed to this constructor');
             }

Indentation +445 added lines, -445 removed lines

@@ -58,450 +58,450 @@
  */
 class EventIterator implements \Iterator {
 
-    /**
-     * Reference timeZone for floating dates and times.
-     *
-     * @var DateTimeZone
-     */
-    protected $timeZone;
-
-    /**
-     * True if we're iterating an all-day event.
-     *
-     * @var bool
-     */
-    protected $allDay = false;
-
-    /**
-     * Creates the iterator.
-     *
-     * There's three ways to set up the iterator.
-     *
-     * 1. You can pass a VCALENDAR component and a UID.
-     * 2. You can pass an array of VEVENTs (all UIDS should match).
-     * 3. You can pass a single VEVENT component.
-     *
-     * Only the second method is recomended. The other 1 and 3 will be removed
-     * at some point in the future.
-     *
-     * The $uid parameter is only required for the first method.
-     *
-     * @param Component|array $input
-     * @param string|null $uid
-     * @param DateTimeZone $timeZone Reference timezone for floating dates and
-     *                               times.
-     */
-    public function __construct($input, $uid = null, DateTimeZone $timeZone = null) {
-
-        if (is_null($timeZone)) {
-            $timeZone = new DateTimeZone('UTC');
-        }
-        $this->timeZone = $timeZone;
-
-        if (is_array($input)) {
-            $events = $input;
-        } elseif ($input instanceof VEvent) {
-            // Single instance mode.
-            $events = [$input];
-        } else {
-            // Calendar + UID mode.
-            $uid = (string)$uid;
-            if (!$uid) {
-                throw new InvalidArgumentException('The UID argument is required when a VCALENDAR is passed to this constructor');
-            }
-            if (!isset($input->VEVENT)) {
-                throw new InvalidArgumentException('No events found in this calendar');
-            }
-            $events = $input->getByUID($uid);
-
-        }
-
-        foreach ($events as $vevent) {
-
-            if (!isset($vevent->{'RECURRENCE-ID'})) {
-
-                $this->masterEvent = $vevent;
-
-            } else {
-
-                $this->exceptions[
-                    $vevent->{'RECURRENCE-ID'}->getDateTime($this->timeZone)->getTimeStamp()
-                ] = true;
-                $this->overriddenEvents[] = $vevent;
-
-            }
-
-        }
-
-        if (!$this->masterEvent) {
-            // No base event was found. CalDAV does allow cases where only
-            // overridden instances are stored.
-            //
-            // In this particular case, we're just going to grab the first
-            // event and use that instead. This may not always give the
-            // desired result.
-            if (!count($this->overriddenEvents)) {
-                throw new InvalidArgumentException('This VCALENDAR did not have an event with UID: ' . $uid);
-            }
-            $this->masterEvent = array_shift($this->overriddenEvents);
-        }
-
-        $this->startDate = $this->masterEvent->DTSTART->getDateTime($this->timeZone);
-        $this->allDay = !$this->masterEvent->DTSTART->hasTime();
-
-        if (isset($this->masterEvent->EXDATE)) {
-
-            foreach ($this->masterEvent->EXDATE as $exDate) {
-
-                foreach ($exDate->getDateTimes($this->timeZone) as $dt) {
-                    $this->exceptions[$dt->getTimeStamp()] = true;
-                }
-
-            }
-
-        }
-
-        if (isset($this->masterEvent->DTEND)) {
-            $this->eventDuration =
-                $this->masterEvent->DTEND->getDateTime($this->timeZone)->getTimeStamp() -
-                $this->startDate->getTimeStamp();
-        } elseif (isset($this->masterEvent->DURATION)) {
-            $duration = $this->masterEvent->DURATION->getDateInterval();
-            $end = clone $this->startDate;
-            $end = $end->add($duration);
-            $this->eventDuration = $end->getTimeStamp() - $this->startDate->getTimeStamp();
-        } elseif ($this->allDay) {
-            $this->eventDuration = 3600 * 24;
-        } else {
-            $this->eventDuration = 0;
-        }
-
-        if (isset($this->masterEvent->RDATE)) {
-            $this->recurIterator = new RDateIterator(
-                $this->masterEvent->RDATE->getParts(),
-                $this->startDate
-            );
-        } elseif (isset($this->masterEvent->RRULE)) {
-            $this->recurIterator = new RRuleIterator(
-                $this->masterEvent->RRULE->getParts(),
-                $this->startDate
-            );
-        } else {
-            $this->recurIterator = new RRuleIterator(
-                [
-                    'FREQ'  => 'DAILY',
-                    'COUNT' => 1,
-                ],
-                $this->startDate
-            );
-        }
-
-        $this->rewind();
-        if (!$this->valid()) {
-            throw new NoInstancesException('This recurrence rule does not generate any valid instances');
-        }
-
-    }
-
-    /**
-     * Returns the date for the current position of the iterator.
-     *
-     * @return DateTimeImmutable
-     */
-    public function current() {
-
-        if ($this->currentDate) {
-            return clone $this->currentDate;
-        }
-
-    }
-
-    /**
-     * This method returns the start date for the current iteration of the
-     * event.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDtStart() {
-
-        if ($this->currentDate) {
-            return clone $this->currentDate;
-        }
-
-    }
-
-    /**
-     * This method returns the end date for the current iteration of the
-     * event.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDtEnd() {
-
-        if (!$this->valid()) {
-            return;
-        }
-        $end = clone $this->currentDate;
-        return $end->modify('+' . $this->eventDuration . ' seconds');
-
-    }
-
-    /**
-     * Returns a VEVENT for the current iterations of the event.
-     *
-     * This VEVENT will have a recurrence id, and it's DTSTART and DTEND
-     * altered.
-     *
-     * @return VEvent
-     */
-    public function getEventObject() {
-
-        if ($this->currentOverriddenEvent) {
-            return $this->currentOverriddenEvent;
-        }
-
-        $event = clone $this->masterEvent;
-
-        // Ignoring the following block, because PHPUnit's code coverage
-        // ignores most of these lines, and this messes with our stats.
-        //
-        // @codeCoverageIgnoreStart
-        unset(
-            $event->RRULE,
-            $event->EXDATE,
-            $event->RDATE,
-            $event->EXRULE,
-            $event->{'RECURRENCE-ID'}
-        );
-        // @codeCoverageIgnoreEnd
-
-        $event->DTSTART->setDateTime($this->getDtStart(), $event->DTSTART->isFloating());
-        if (isset($event->DTEND)) {
-            $event->DTEND->setDateTime($this->getDtEnd(), $event->DTEND->isFloating());
-        }
-        $recurid = clone $event->DTSTART;
-        $recurid->name = 'RECURRENCE-ID';
-        $event->add($recurid);
-        return $event;
-
-    }
-
-    /**
-     * Returns the current position of the iterator.
-     *
-     * This is for us simply a 0-based index.
-     *
-     * @return int
-     */
-    public function key() {
-
-        // The counter is always 1 ahead.
-        return $this->counter - 1;
-
-    }
-
-    /**
-     * This is called after next, to see if the iterator is still at a valid
-     * position, or if it's at the end.
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        if ($this->counter > Settings::$maxRecurrences && Settings::$maxRecurrences !== -1) {
-            throw new MaxInstancesExceededException('Recurring events are only allowed to generate ' . Settings::$maxRecurrences);
-        }
-        return !!$this->currentDate;
-
-    }
-
-    /**
-     * Sets the iterator back to the starting point.
-     */
-    public function rewind() {
-
-        $this->recurIterator->rewind();
-        // re-creating overridden event index.
-        $index = [];
-        foreach ($this->overriddenEvents as $key => $event) {
-            $stamp = $event->DTSTART->getDateTime($this->timeZone)->getTimeStamp();
-            $index[$stamp] = $key;
-        }
-        krsort($index);
-        $this->counter = 0;
-        $this->overriddenEventsIndex = $index;
-        $this->currentOverriddenEvent = null;
-
-        $this->nextDate = null;
-        $this->currentDate = clone $this->startDate;
-
-        $this->next();
-
-    }
-
-    /**
-     * Advances the iterator with one step.
-     *
-     * @return void
-     */
-    public function next() {
-
-        $this->currentOverriddenEvent = null;
-        $this->counter++;
-        if ($this->nextDate) {
-            // We had a stored value.
-            $nextDate = $this->nextDate;
-            $this->nextDate = null;
-        } else {
-            // We need to ask rruleparser for the next date.
-            // We need to do this until we find a date that's not in the
-            // exception list.
-            do {
-                if (!$this->recurIterator->valid()) {
-                    $nextDate = null;
-                    break;
-                }
-                $nextDate = $this->recurIterator->current();
-                $this->recurIterator->next();
-            } while (isset($this->exceptions[$nextDate->getTimeStamp()]));
-
-        }
-
-
-        // $nextDate now contains what rrule thinks is the next one, but an
-        // overridden event may cut ahead.
-        if ($this->overriddenEventsIndex) {
-
-            $offset = end($this->overriddenEventsIndex);
-            $timestamp = key($this->overriddenEventsIndex);
-            if (!$nextDate || $timestamp < $nextDate->getTimeStamp()) {
-                // Overridden event comes first.
-                $this->currentOverriddenEvent = $this->overriddenEvents[$offset];
-
-                // Putting the rrule next date aside.
-                $this->nextDate = $nextDate;
-                $this->currentDate = $this->currentOverriddenEvent->DTSTART->getDateTime($this->timeZone);
-
-                // Ensuring that this item will only be used once.
-                array_pop($this->overriddenEventsIndex);
-
-                // Exit point!
-                return;
-
-            }
-
-        }
-
-        $this->currentDate = $nextDate;
-
-    }
-
-    /**
-     * Quickly jump to a date in the future.
-     *
-     * @param DateTimeInterface $dateTime
-     */
-    public function fastForward(DateTimeInterface $dateTime) {
-
-        while ($this->valid() && $this->getDtEnd() < $dateTime) {
-            $this->next();
-        }
-
-    }
-
-    /**
-     * Returns true if this recurring event never ends.
-     *
-     * @return bool
-     */
-    public function isInfinite() {
-
-        return $this->recurIterator->isInfinite();
-
-    }
-
-    /**
-     * RRULE parser.
-     *
-     * @var RRuleIterator
-     */
-    protected $recurIterator;
-
-    /**
-     * The duration, in seconds, of the master event.
-     *
-     * We use this to calculate the DTEND for subsequent events.
-     */
-    protected $eventDuration;
-
-    /**
-     * A reference to the main (master) event.
-     *
-     * @var VEVENT
-     */
-    protected $masterEvent;
-
-    /**
-     * List of overridden events.
-     *
-     * @var array
-     */
-    protected $overriddenEvents = [];
-
-    /**
-     * Overridden event index.
-     *
-     * Key is timestamp, value is the index of the item in the $overriddenEvent
-     * property.
-     *
-     * @var array
-     */
-    protected $overriddenEventsIndex;
-
-    /**
-     * A list of recurrence-id's that are either part of EXDATE, or are
-     * overridden.
-     *
-     * @var array
-     */
-    protected $exceptions = [];
-
-    /**
-     * Internal event counter.
-     *
-     * @var int
-     */
-    protected $counter;
-
-    /**
-     * The very start of the iteration process.
-     *
-     * @var DateTimeImmutable
-     */
-    protected $startDate;
-
-    /**
-     * Where we are currently in the iteration process.
-     *
-     * @var DateTimeImmutable
-     */
-    protected $currentDate;
-
-    /**
-     * The next date from the rrule parser.
-     *
-     * Sometimes we need to temporary store the next date, because an
-     * overridden event came before.
-     *
-     * @var DateTimeImmutable
-     */
-    protected $nextDate;
-
-    /**
-     * The event that overwrites the current iteration
-     *
-     * @var VEVENT
-     */
-    protected $currentOverriddenEvent;
+	/**
+	 * Reference timeZone for floating dates and times.
+	 *
+	 * @var DateTimeZone
+	 */
+	protected $timeZone;
+
+	/**
+	 * True if we're iterating an all-day event.
+	 *
+	 * @var bool
+	 */
+	protected $allDay = false;
+
+	/**
+	 * Creates the iterator.
+	 *
+	 * There's three ways to set up the iterator.
+	 *
+	 * 1. You can pass a VCALENDAR component and a UID.
+	 * 2. You can pass an array of VEVENTs (all UIDS should match).
+	 * 3. You can pass a single VEVENT component.
+	 *
+	 * Only the second method is recomended. The other 1 and 3 will be removed
+	 * at some point in the future.
+	 *
+	 * The $uid parameter is only required for the first method.
+	 *
+	 * @param Component|array $input
+	 * @param string|null $uid
+	 * @param DateTimeZone $timeZone Reference timezone for floating dates and
+	 *                               times.
+	 */
+	public function __construct($input, $uid = null, DateTimeZone $timeZone = null) {
+
+		if (is_null($timeZone)) {
+			$timeZone = new DateTimeZone('UTC');
+		}
+		$this->timeZone = $timeZone;
+
+		if (is_array($input)) {
+			$events = $input;
+		} elseif ($input instanceof VEvent) {
+			// Single instance mode.
+			$events = [$input];
+		} else {
+			// Calendar + UID mode.
+			$uid = (string)$uid;
+			if (!$uid) {
+				throw new InvalidArgumentException('The UID argument is required when a VCALENDAR is passed to this constructor');
+			}
+			if (!isset($input->VEVENT)) {
+				throw new InvalidArgumentException('No events found in this calendar');
+			}
+			$events = $input->getByUID($uid);
+
+		}
+
+		foreach ($events as $vevent) {
+
+			if (!isset($vevent->{'RECURRENCE-ID'})) {
+
+				$this->masterEvent = $vevent;
+
+			} else {
+
+				$this->exceptions[
+					$vevent->{'RECURRENCE-ID'}->getDateTime($this->timeZone)->getTimeStamp()
+				] = true;
+				$this->overriddenEvents[] = $vevent;
+
+			}
+
+		}
+
+		if (!$this->masterEvent) {
+			// No base event was found. CalDAV does allow cases where only
+			// overridden instances are stored.
+			//
+			// In this particular case, we're just going to grab the first
+			// event and use that instead. This may not always give the
+			// desired result.
+			if (!count($this->overriddenEvents)) {
+				throw new InvalidArgumentException('This VCALENDAR did not have an event with UID: ' . $uid);
+			}
+			$this->masterEvent = array_shift($this->overriddenEvents);
+		}
+
+		$this->startDate = $this->masterEvent->DTSTART->getDateTime($this->timeZone);
+		$this->allDay = !$this->masterEvent->DTSTART->hasTime();
+
+		if (isset($this->masterEvent->EXDATE)) {
+
+			foreach ($this->masterEvent->EXDATE as $exDate) {
+
+				foreach ($exDate->getDateTimes($this->timeZone) as $dt) {
+					$this->exceptions[$dt->getTimeStamp()] = true;
+				}
+
+			}
+
+		}
+
+		if (isset($this->masterEvent->DTEND)) {
+			$this->eventDuration =
+				$this->masterEvent->DTEND->getDateTime($this->timeZone)->getTimeStamp() -
+				$this->startDate->getTimeStamp();
+		} elseif (isset($this->masterEvent->DURATION)) {
+			$duration = $this->masterEvent->DURATION->getDateInterval();
+			$end = clone $this->startDate;
+			$end = $end->add($duration);
+			$this->eventDuration = $end->getTimeStamp() - $this->startDate->getTimeStamp();
+		} elseif ($this->allDay) {
+			$this->eventDuration = 3600 * 24;
+		} else {
+			$this->eventDuration = 0;
+		}
+
+		if (isset($this->masterEvent->RDATE)) {
+			$this->recurIterator = new RDateIterator(
+				$this->masterEvent->RDATE->getParts(),
+				$this->startDate
+			);
+		} elseif (isset($this->masterEvent->RRULE)) {
+			$this->recurIterator = new RRuleIterator(
+				$this->masterEvent->RRULE->getParts(),
+				$this->startDate
+			);
+		} else {
+			$this->recurIterator = new RRuleIterator(
+				[
+					'FREQ'  => 'DAILY',
+					'COUNT' => 1,
+				],
+				$this->startDate
+			);
+		}
+
+		$this->rewind();
+		if (!$this->valid()) {
+			throw new NoInstancesException('This recurrence rule does not generate any valid instances');
+		}
+
+	}
+
+	/**
+	 * Returns the date for the current position of the iterator.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function current() {
+
+		if ($this->currentDate) {
+			return clone $this->currentDate;
+		}
+
+	}
+
+	/**
+	 * This method returns the start date for the current iteration of the
+	 * event.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDtStart() {
+
+		if ($this->currentDate) {
+			return clone $this->currentDate;
+		}
+
+	}
+
+	/**
+	 * This method returns the end date for the current iteration of the
+	 * event.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDtEnd() {
+
+		if (!$this->valid()) {
+			return;
+		}
+		$end = clone $this->currentDate;
+		return $end->modify('+' . $this->eventDuration . ' seconds');
+
+	}
+
+	/**
+	 * Returns a VEVENT for the current iterations of the event.
+	 *
+	 * This VEVENT will have a recurrence id, and it's DTSTART and DTEND
+	 * altered.
+	 *
+	 * @return VEvent
+	 */
+	public function getEventObject() {
+
+		if ($this->currentOverriddenEvent) {
+			return $this->currentOverriddenEvent;
+		}
+
+		$event = clone $this->masterEvent;
+
+		// Ignoring the following block, because PHPUnit's code coverage
+		// ignores most of these lines, and this messes with our stats.
+		//
+		// @codeCoverageIgnoreStart
+		unset(
+			$event->RRULE,
+			$event->EXDATE,
+			$event->RDATE,
+			$event->EXRULE,
+			$event->{'RECURRENCE-ID'}
+		);
+		// @codeCoverageIgnoreEnd
+
+		$event->DTSTART->setDateTime($this->getDtStart(), $event->DTSTART->isFloating());
+		if (isset($event->DTEND)) {
+			$event->DTEND->setDateTime($this->getDtEnd(), $event->DTEND->isFloating());
+		}
+		$recurid = clone $event->DTSTART;
+		$recurid->name = 'RECURRENCE-ID';
+		$event->add($recurid);
+		return $event;
+
+	}
+
+	/**
+	 * Returns the current position of the iterator.
+	 *
+	 * This is for us simply a 0-based index.
+	 *
+	 * @return int
+	 */
+	public function key() {
+
+		// The counter is always 1 ahead.
+		return $this->counter - 1;
+
+	}
+
+	/**
+	 * This is called after next, to see if the iterator is still at a valid
+	 * position, or if it's at the end.
+	 *
+	 * @return bool
+	 */
+	public function valid() {
+
+		if ($this->counter > Settings::$maxRecurrences && Settings::$maxRecurrences !== -1) {
+			throw new MaxInstancesExceededException('Recurring events are only allowed to generate ' . Settings::$maxRecurrences);
+		}
+		return !!$this->currentDate;
+
+	}
+
+	/**
+	 * Sets the iterator back to the starting point.
+	 */
+	public function rewind() {
+
+		$this->recurIterator->rewind();
+		// re-creating overridden event index.
+		$index = [];
+		foreach ($this->overriddenEvents as $key => $event) {
+			$stamp = $event->DTSTART->getDateTime($this->timeZone)->getTimeStamp();
+			$index[$stamp] = $key;
+		}
+		krsort($index);
+		$this->counter = 0;
+		$this->overriddenEventsIndex = $index;
+		$this->currentOverriddenEvent = null;
+
+		$this->nextDate = null;
+		$this->currentDate = clone $this->startDate;
+
+		$this->next();
+
+	}
+
+	/**
+	 * Advances the iterator with one step.
+	 *
+	 * @return void
+	 */
+	public function next() {
+
+		$this->currentOverriddenEvent = null;
+		$this->counter++;
+		if ($this->nextDate) {
+			// We had a stored value.
+			$nextDate = $this->nextDate;
+			$this->nextDate = null;
+		} else {
+			// We need to ask rruleparser for the next date.
+			// We need to do this until we find a date that's not in the
+			// exception list.
+			do {
+				if (!$this->recurIterator->valid()) {
+					$nextDate = null;
+					break;
+				}
+				$nextDate = $this->recurIterator->current();
+				$this->recurIterator->next();
+			} while (isset($this->exceptions[$nextDate->getTimeStamp()]));
+
+		}
+
+
+		// $nextDate now contains what rrule thinks is the next one, but an
+		// overridden event may cut ahead.
+		if ($this->overriddenEventsIndex) {
+
+			$offset = end($this->overriddenEventsIndex);
+			$timestamp = key($this->overriddenEventsIndex);
+			if (!$nextDate || $timestamp < $nextDate->getTimeStamp()) {
+				// Overridden event comes first.
+				$this->currentOverriddenEvent = $this->overriddenEvents[$offset];
+
+				// Putting the rrule next date aside.
+				$this->nextDate = $nextDate;
+				$this->currentDate = $this->currentOverriddenEvent->DTSTART->getDateTime($this->timeZone);
+
+				// Ensuring that this item will only be used once.
+				array_pop($this->overriddenEventsIndex);
+
+				// Exit point!
+				return;
+
+			}
+
+		}
+
+		$this->currentDate = $nextDate;
+
+	}
+
+	/**
+	 * Quickly jump to a date in the future.
+	 *
+	 * @param DateTimeInterface $dateTime
+	 */
+	public function fastForward(DateTimeInterface $dateTime) {
+
+		while ($this->valid() && $this->getDtEnd() < $dateTime) {
+			$this->next();
+		}
+
+	}
+
+	/**
+	 * Returns true if this recurring event never ends.
+	 *
+	 * @return bool
+	 */
+	public function isInfinite() {
+
+		return $this->recurIterator->isInfinite();
+
+	}
+
+	/**
+	 * RRULE parser.
+	 *
+	 * @var RRuleIterator
+	 */
+	protected $recurIterator;
+
+	/**
+	 * The duration, in seconds, of the master event.
+	 *
+	 * We use this to calculate the DTEND for subsequent events.
+	 */
+	protected $eventDuration;
+
+	/**
+	 * A reference to the main (master) event.
+	 *
+	 * @var VEVENT
+	 */
+	protected $masterEvent;
+
+	/**
+	 * List of overridden events.
+	 *
+	 * @var array
+	 */
+	protected $overriddenEvents = [];
+
+	/**
+	 * Overridden event index.
+	 *
+	 * Key is timestamp, value is the index of the item in the $overriddenEvent
+	 * property.
+	 *
+	 * @var array
+	 */
+	protected $overriddenEventsIndex;
+
+	/**
+	 * A list of recurrence-id's that are either part of EXDATE, or are
+	 * overridden.
+	 *
+	 * @var array
+	 */
+	protected $exceptions = [];
+
+	/**
+	 * Internal event counter.
+	 *
+	 * @var int
+	 */
+	protected $counter;
+
+	/**
+	 * The very start of the iteration process.
+	 *
+	 * @var DateTimeImmutable
+	 */
+	protected $startDate;
+
+	/**
+	 * Where we are currently in the iteration process.
+	 *
+	 * @var DateTimeImmutable
+	 */
+	protected $currentDate;
+
+	/**
+	 * The next date from the rrule parser.
+	 *
+	 * Sometimes we need to temporary store the next date, because an
+	 * overridden event came before.
+	 *
+	 * @var DateTimeImmutable
+	 */
+	protected $nextDate;
+
+	/**
+	 * The event that overwrites the current iteration
+	 *
+	 * @var VEVENT
+	 */
+	protected $currentOverriddenEvent;
 
 }

libraries/SabreDAV/VObject/Recur/RDateIterator.php

Doc Comments -1 removed lines

@@ -158,7 +158,6 @@
      * This method receives a string from an RRULE property, and populates this
      * class with all the values.
      *
-     * @param string|array $rrule
      *
      * @return void
      */

Indentation +155 added lines, -155 removed lines

@@ -21,162 +21,162 @@
  */
 class RDateIterator implements Iterator {
 
-    /**
-     * Creates the Iterator.
-     *
-     * @param string|array $rrule
-     * @param DateTimeInterface $start
-     */
-    public function __construct($rrule, DateTimeInterface $start) {
+	/**
+	 * Creates the Iterator.
+	 *
+	 * @param string|array $rrule
+	 * @param DateTimeInterface $start
+	 */
+	public function __construct($rrule, DateTimeInterface $start) {
 
-        $this->startDate = $start;
-        $this->parseRDate($rrule);
-        $this->currentDate = clone $this->startDate;
-
-    }
+		$this->startDate = $start;
+		$this->parseRDate($rrule);
+		$this->currentDate = clone $this->startDate;
+
+	}
 
-    /* Implementation of the Iterator interface {{{ */
-
-    public function current() {
-
-        if (!$this->valid()) return;
-        return clone $this->currentDate;
-
-    }
-
-    /**
-     * Returns the current item number.
-     *
-     * @return int
-     */
-    public function key() {
-
-        return $this->counter;
-
-    }
-
-    /**
-     * Returns whether the current item is a valid item for the recurrence
-     * iterator.
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        return ($this->counter <= count($this->dates));
-
-    }
-
-    /**
-     * Resets the iterator.
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->currentDate = clone $this->startDate;
-        $this->counter = 0;
-
-    }
-
-    /**
-     * Goes on to the next iteration.
-     *
-     * @return void
-     */
-    public function next() {
-
-        $this->counter++;
-        if (!$this->valid()) return;
-
-        $this->currentDate =
-            DateTimeParser::parse(
-                $this->dates[$this->counter - 1],
-                $this->startDate->getTimezone()
-            );
-
-    }
-
-    /* End of Iterator implementation }}} */
-
-    /**
-     * Returns true if this recurring event never ends.
-     *
-     * @return bool
-     */
-    public function isInfinite() {
-
-        return false;
-
-    }
-
-    /**
-     * This method allows you to quickly go to the next occurrence after the
-     * specified date.
-     *
-     * @param DateTimeInterface $dt
-     *
-     * @return void
-     */
-    public function fastForward(DateTimeInterface $dt) {
-
-        while ($this->valid() && $this->currentDate < $dt) {
-            $this->next();
-        }
-
-    }
-
-    /**
-     * The reference start date/time for the rrule.
-     *
-     * All calculations are based on this initial date.
-     *
-     * @var DateTimeInterface
-     */
-    protected $startDate;
-
-    /**
-     * The date of the current iteration. You can get this by calling
-     * ->current().
-     *
-     * @var DateTimeInterface
-     */
-    protected $currentDate;
-
-    /**
-     * The current item in the list.
-     *
-     * You can get this number with the key() method.
-     *
-     * @var int
-     */
-    protected $counter = 0;
-
-    /* }}} */
-
-    /**
-     * This method receives a string from an RRULE property, and populates this
-     * class with all the values.
-     *
-     * @param string|array $rrule
-     *
-     * @return void
-     */
-    protected function parseRDate($rdate) {
-
-        if (is_string($rdate)) {
-            $rdate = explode(',', $rdate);
-        }
-
-        $this->dates = $rdate;
-
-    }
-
-    /**
-     * Array with the RRULE dates
-     *
-     * @var array
-     */
-    protected $dates = [];
+	/* Implementation of the Iterator interface {{{ */
+
+	public function current() {
+
+		if (!$this->valid()) return;
+		return clone $this->currentDate;
+
+	}
+
+	/**
+	 * Returns the current item number.
+	 *
+	 * @return int
+	 */
+	public function key() {
+
+		return $this->counter;
+
+	}
+
+	/**
+	 * Returns whether the current item is a valid item for the recurrence
+	 * iterator.
+	 *
+	 * @return bool
+	 */
+	public function valid() {
+
+		return ($this->counter <= count($this->dates));
+
+	}
+
+	/**
+	 * Resets the iterator.
+	 *
+	 * @return void
+	 */
+	public function rewind() {
+
+		$this->currentDate = clone $this->startDate;
+		$this->counter = 0;
+
+	}
+
+	/**
+	 * Goes on to the next iteration.
+	 *
+	 * @return void
+	 */
+	public function next() {
+
+		$this->counter++;
+		if (!$this->valid()) return;
+
+		$this->currentDate =
+			DateTimeParser::parse(
+				$this->dates[$this->counter - 1],
+				$this->startDate->getTimezone()
+			);
+
+	}
+
+	/* End of Iterator implementation }}} */
+
+	/**
+	 * Returns true if this recurring event never ends.
+	 *
+	 * @return bool
+	 */
+	public function isInfinite() {
+
+		return false;
+
+	}
+
+	/**
+	 * This method allows you to quickly go to the next occurrence after the
+	 * specified date.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return void
+	 */
+	public function fastForward(DateTimeInterface $dt) {
+
+		while ($this->valid() && $this->currentDate < $dt) {
+			$this->next();
+		}
+
+	}
+
+	/**
+	 * The reference start date/time for the rrule.
+	 *
+	 * All calculations are based on this initial date.
+	 *
+	 * @var DateTimeInterface
+	 */
+	protected $startDate;
+
+	/**
+	 * The date of the current iteration. You can get this by calling
+	 * ->current().
+	 *
+	 * @var DateTimeInterface
+	 */
+	protected $currentDate;
+
+	/**
+	 * The current item in the list.
+	 *
+	 * You can get this number with the key() method.
+	 *
+	 * @var int
+	 */
+	protected $counter = 0;
+
+	/* }}} */
+
+	/**
+	 * This method receives a string from an RRULE property, and populates this
+	 * class with all the values.
+	 *
+	 * @param string|array $rrule
+	 *
+	 * @return void
+	 */
+	protected function parseRDate($rdate) {
+
+		if (is_string($rdate)) {
+			$rdate = explode(',', $rdate);
+		}
+
+		$this->dates = $rdate;
+
+	}
+
+	/**
+	 * Array with the RRULE dates
+	 *
+	 * @var array
+	 */
+	protected $dates = [];
 
 }

Braces +6 added lines, -2 removed lines

@@ -39,7 +39,9 @@ 
 
     public function current() {
 
-        if (!$this->valid()) return;
+        if (!$this->valid()) {
+        	return;
+        }
         return clone $this->currentDate;
 
     }
@@ -87,7 +89,9 @@ 
     public function next() {
 
         $this->counter++;
-        if (!$this->valid()) return;
+        if (!$this->valid()) {
+        	return;
+        }
 
         $this->currentDate =
             DateTimeParser::parse(

libraries/SabreDAV/VObject/Recur/RRuleIterator.php

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

@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Recur;
 
-use DateTimeInterface;
 use DateTimeImmutable;
+use DateTimeInterface;
 use Iterator;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;

Spacing +27 added lines, -27 removed lines

@@ -374,8 +374,8 @@ 
             $currentHour = $this->currentDate->format('G');
 
         } while (
-            ($this->byDay   && !in_array($currentDay, $recurrenceDays)) ||
-            ($this->byHour  && !in_array($currentHour, $recurrenceHours)) ||
+            ($this->byDay && !in_array($currentDay, $recurrenceDays)) ||
+            ($this->byHour && !in_array($currentHour, $recurrenceHours)) ||
             ($this->byMonth && !in_array($currentMonth, $recurrenceMonths))
         );
 
@@ -413,10 +413,10 @@ 
             }
 
             // Current day of the week
-            $currentDay = (int)$this->currentDate->format('w');
+            $currentDay = (int) $this->currentDate->format('w');
 
             // Current hour of the day
-            $currentHour = (int)$this->currentDate->format('G');
+            $currentHour = (int) $this->currentDate->format('G');
 
             // We need to roll over to the next week
             if ($currentDay === $firstDay && (!$this->byHour || $currentHour == '0')) {
@@ -491,9 +491,9 @@ 
         }
 
         $this->currentDate = $this->currentDate->setDate(
-            (int)$this->currentDate->format('Y'),
-            (int)$this->currentDate->format('n'),
-            (int)$occurrence
+            (int) $this->currentDate->format('Y'),
+            (int) $this->currentDate->format('n'),
+            (int) $occurrence
         );
 
     }
@@ -582,18 +582,18 @@ 
                 } while (!in_array($currentMonth, $this->byMonth));
 
                 $this->currentDate = $this->currentDate->setDate(
-                    (int)$currentYear,
-                    (int)$currentMonth,
-                    (int)$currentDayOfMonth
+                    (int) $currentYear,
+                    (int) $currentMonth,
+                    (int) $currentDayOfMonth
                 );
 
             }
 
             // If we made it here, it means we got a valid occurrence
             $this->currentDate = $this->currentDate->setDate(
-                (int)$currentYear,
-                (int)$currentMonth,
-                (int)$occurrence
+                (int) $currentYear,
+                (int) $currentMonth,
+                (int) $occurrence
             );
             return;
 
@@ -610,9 +610,9 @@ 
                 }
             } while (!in_array($currentMonth, $this->byMonth));
             $this->currentDate = $this->currentDate->setDate(
-                (int)$currentYear,
-                (int)$currentMonth,
-                (int)$currentDayOfMonth
+                (int) $currentYear,
+                (int) $currentMonth,
+                (int) $currentDayOfMonth
             );
 
             return;
@@ -673,7 +673,7 @@ 
                     // No break
 
                 case 'COUNT' :
-                    $val = (int)$value;
+                    $val = (int) $value;
                     if ($val < 1) {
                         throw new InvalidDataException(strtoupper($key) . ' in RRULE must be a positive integer!');
                     }
@@ -682,19 +682,19 @@ 
                     break;
 
                 case 'BYSECOND' :
-                    $this->bySecond = (array)$value;
+                    $this->bySecond = (array) $value;
                     break;
 
                 case 'BYMINUTE' :
-                    $this->byMinute = (array)$value;
+                    $this->byMinute = (array) $value;
                     break;
 
                 case 'BYHOUR' :
-                    $this->byHour = (array)$value;
+                    $this->byHour = (array) $value;
                     break;
 
                 case 'BYDAY' :
-                    $value = (array)$value;
+                    $value = (array) $value;
                     foreach ($value as $part) {
                         if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $# xi', $part)) {
                             throw new InvalidDataException('Invalid part in BYDAY clause: ' . $part);
@@ -704,23 +704,23 @@ 
                     break;
 
                 case 'BYMONTHDAY' :
-                    $this->byMonthDay = (array)$value;
+                    $this->byMonthDay = (array) $value;
                     break;
 
                 case 'BYYEARDAY' :
-                    $this->byYearDay = (array)$value;
+                    $this->byYearDay = (array) $value;
                     break;
 
                 case 'BYWEEKNO' :
-                    $this->byWeekNo = (array)$value;
+                    $this->byWeekNo = (array) $value;
                     break;
 
                 case 'BYMONTH' :
-                    $this->byMonth = (array)$value;
+                    $this->byMonth = (array) $value;
                     break;
 
                 case 'BYSETPOS' :
-                    $this->bySetPos = (array)$value;
+                    $this->bySetPos = (array) $value;
                     break;
 
                 case 'WKST' :
@@ -792,7 +792,7 @@ 
             // possible that the user only really wanted the 1st, 2nd or last
             // wednesday.
             if (strlen($day) > 2) {
-                $offset = (int)substr($day, 0, -2);
+                $offset = (int) substr($day, 0, -2);
 
                 if ($offset > 0) {
                     // It is possible that the day does not exist, such as a

Indentation +885 added lines, -885 removed lines

@@ -24,897 +24,897 @@
  */
 class RRuleIterator implements Iterator {
 
-    /**
-     * Creates the Iterator.
-     *
-     * @param string|array $rrule
-     * @param DateTimeInterface $start
-     */
-    public function __construct($rrule, DateTimeInterface $start) {
+	/**
+	 * Creates the Iterator.
+	 *
+	 * @param string|array $rrule
+	 * @param DateTimeInterface $start
+	 */
+	public function __construct($rrule, DateTimeInterface $start) {
 
-        $this->startDate = $start;
-        $this->parseRRule($rrule);
-        $this->currentDate = clone $this->startDate;
+		$this->startDate = $start;
+		$this->parseRRule($rrule);
+		$this->currentDate = clone $this->startDate;
 
-    }
+	}
 
-    /* Implementation of the Iterator interface {{{ */
+	/* Implementation of the Iterator interface {{{ */
 
-    public function current() {
+	public function current() {
 
-        if (!$this->valid()) return;
-        return clone $this->currentDate;
+		if (!$this->valid()) return;
+		return clone $this->currentDate;
 
-    }
+	}
 
-    /**
-     * Returns the current item number.
-     *
-     * @return int
-     */
-    public function key() {
+	/**
+	 * Returns the current item number.
+	 *
+	 * @return int
+	 */
+	public function key() {
 
-        return $this->counter;
-
-    }
-
-    /**
-     * Returns whether the current item is a valid item for the recurrence
-     * iterator. This will return false if we've gone beyond the UNTIL or COUNT
-     * statements.
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        if (!is_null($this->count)) {
-            return $this->counter < $this->count;
-        }
-        return is_null($this->until) || $this->currentDate <= $this->until;
-
-    }
-
-    /**
-     * Resets the iterator.
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->currentDate = clone $this->startDate;
-        $this->counter = 0;
-
-    }
-
-    /**
-     * Goes on to the next iteration.
-     *
-     * @return void
-     */
-    public function next() {
-
-        // Otherwise, we find the next event in the normal RRULE
-        // sequence.
-        switch ($this->frequency) {
-
-            case 'hourly' :
-                $this->nextHourly();
-                break;
-
-            case 'daily' :
-                $this->nextDaily();
-                break;
-
-            case 'weekly' :
-                $this->nextWeekly();
-                break;
-
-            case 'monthly' :
-                $this->nextMonthly();
-                break;
-
-            case 'yearly' :
-                $this->nextYearly();
-                break;
-
-        }
-        $this->counter++;
-
-    }
-
-    /* End of Iterator implementation }}} */
-
-    /**
-     * Returns true if this recurring event never ends.
-     *
-     * @return bool
-     */
-    public function isInfinite() {
-
-        return !$this->count && !$this->until;
-
-    }
-
-    /**
-     * This method allows you to quickly go to the next occurrence after the
-     * specified date.
-     *
-     * @param DateTimeInterface $dt
-     *
-     * @return void
-     */
-    public function fastForward(DateTimeInterface $dt) {
-
-        while ($this->valid() && $this->currentDate < $dt) {
-            $this->next();
-        }
-
-    }
-
-    /**
-     * The reference start date/time for the rrule.
-     *
-     * All calculations are based on this initial date.
-     *
-     * @var DateTimeInterface
-     */
-    protected $startDate;
-
-    /**
-     * The date of the current iteration. You can get this by calling
-     * ->current().
-     *
-     * @var DateTimeInterface
-     */
-    protected $currentDate;
-
-    /**
-     * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
-     * yearly.
-     *
-     * @var string
-     */
-    protected $frequency;
-
-    /**
-     * The number of recurrences, or 'null' if infinitely recurring.
-     *
-     * @var int
-     */
-    protected $count;
-
-    /**
-     * The interval.
-     *
-     * If for example frequency is set to daily, interval = 2 would mean every
-     * 2 days.
-     *
-     * @var int
-     */
-    protected $interval = 1;
-
-    /**
-     * The last instance of this recurrence, inclusively.
-     *
-     * @var DateTimeInterface|null
-     */
-    protected $until;
-
-    /**
-     * Which seconds to recur.
-     *
-     * This is an array of integers (between 0 and 60)
-     *
-     * @var array
-     */
-    protected $bySecond;
-
-    /**
-     * Which minutes to recur.
-     *
-     * This is an array of integers (between 0 and 59)
-     *
-     * @var array
-     */
-    protected $byMinute;
-
-    /**
-     * Which hours to recur.
-     *
-     * This is an array of integers (between 0 and 23)
-     *
-     * @var array
-     */
-    protected $byHour;
-
-    /**
-     * The current item in the list.
-     *
-     * You can get this number with the key() method.
-     *
-     * @var int
-     */
-    protected $counter = 0;
-
-    /**
-     * Which weekdays to recur.
-     *
-     * This is an array of weekdays
-     *
-     * This may also be preceeded by a positive or negative integer. If present,
-     * this indicates the nth occurrence of a specific day within the monthly or
-     * yearly rrule. For instance, -2TU indicates the second-last tuesday of
-     * the month, or year.
-     *
-     * @var array
-     */
-    protected $byDay;
-
-    /**
-     * Which days of the month to recur.
-     *
-     * This is an array of days of the months (1-31). The value can also be
-     * negative. -5 for instance means the 5th last day of the month.
-     *
-     * @var array
-     */
-    protected $byMonthDay;
-
-    /**
-     * Which days of the year to recur.
-     *
-     * This is an array with days of the year (1 to 366). The values can also
-     * be negative. For instance, -1 will always represent the last day of the
-     * year. (December 31st).
-     *
-     * @var array
-     */
-    protected $byYearDay;
-
-    /**
-     * Which week numbers to recur.
-     *
-     * This is an array of integers from 1 to 53. The values can also be
-     * negative. -1 will always refer to the last week of the year.
-     *
-     * @var array
-     */
-    protected $byWeekNo;
-
-    /**
-     * Which months to recur.
-     *
-     * This is an array of integers from 1 to 12.
-     *
-     * @var array
-     */
-    protected $byMonth;
-
-    /**
-     * Which items in an existing st to recur.
-     *
-     * These numbers work together with an existing by* rule. It specifies
-     * exactly which items of the existing by-rule to filter.
-     *
-     * Valid values are 1 to 366 and -1 to -366. As an example, this can be
-     * used to recur the last workday of the month.
-     *
-     * This would be done by setting frequency to 'monthly', byDay to
-     * 'MO,TU,WE,TH,FR' and bySetPos to -1.
-     *
-     * @var array
-     */
-    protected $bySetPos;
-
-    /**
-     * When the week starts.
-     *
-     * @var string
-     */
-    protected $weekStart = 'MO';
-
-    /* Functions that advance the iterator {{{ */
-
-    /**
-     * Does the processing for advancing the iterator for hourly frequency.
-     *
-     * @return void
-     */
-    protected function nextHourly() {
-
-        $this->currentDate = $this->currentDate->modify('+' . $this->interval . ' hours');
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for daily frequency.
-     *
-     * @return void
-     */
-    protected function nextDaily() {
-
-        if (!$this->byHour && !$this->byDay) {
-            $this->currentDate = $this->currentDate->modify('+' . $this->interval . ' days');
-            return;
-        }
-
-        if (!empty($this->byHour)) {
-            $recurrenceHours = $this->getHours();
-        }
-
-        if (!empty($this->byDay)) {
-            $recurrenceDays = $this->getDays();
-        }
-
-        if (!empty($this->byMonth)) {
-            $recurrenceMonths = $this->getMonths();
-        }
-
-        do {
-            if ($this->byHour) {
-                if ($this->currentDate->format('G') == '23') {
-                    // to obey the interval rule
-                    $this->currentDate = $this->currentDate->modify('+' . $this->interval - 1 . ' days');
-                }
-
-                $this->currentDate = $this->currentDate->modify('+1 hours');
-
-            } else {
-                $this->currentDate = $this->currentDate->modify('+' . $this->interval . ' days');
-
-            }
-
-            // Current month of the year
-            $currentMonth = $this->currentDate->format('n');
-
-            // Current day of the week
-            $currentDay = $this->currentDate->format('w');
-
-            // Current hour of the day
-            $currentHour = $this->currentDate->format('G');
-
-        } while (
-            ($this->byDay   && !in_array($currentDay, $recurrenceDays)) ||
-            ($this->byHour  && !in_array($currentHour, $recurrenceHours)) ||
-            ($this->byMonth && !in_array($currentMonth, $recurrenceMonths))
-        );
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for weekly frequency.
-     *
-     * @return void
-     */
-    protected function nextWeekly() {
-
-        if (!$this->byHour && !$this->byDay) {
-            $this->currentDate = $this->currentDate->modify('+' . $this->interval . ' weeks');
-            return;
-        }
-
-        if ($this->byHour) {
-            $recurrenceHours = $this->getHours();
-        }
-
-        if ($this->byDay) {
-            $recurrenceDays = $this->getDays();
-        }
-
-        // First day of the week:
-        $firstDay = $this->dayMap[$this->weekStart];
-
-        do {
-
-            if ($this->byHour) {
-                $this->currentDate = $this->currentDate->modify('+1 hours');
-            } else {
-                $this->currentDate = $this->currentDate->modify('+1 days');
-            }
-
-            // Current day of the week
-            $currentDay = (int)$this->currentDate->format('w');
-
-            // Current hour of the day
-            $currentHour = (int)$this->currentDate->format('G');
-
-            // We need to roll over to the next week
-            if ($currentDay === $firstDay && (!$this->byHour || $currentHour == '0')) {
-                $this->currentDate = $this->currentDate->modify('+' . $this->interval - 1 . ' weeks');
-
-                // We need to go to the first day of this week, but only if we
-                // are not already on this first day of this week.
-                if ($this->currentDate->format('w') != $firstDay) {
-                    $this->currentDate = $this->currentDate->modify('last ' . $this->dayNames[$this->dayMap[$this->weekStart]]);
-                }
-            }
-
-            // We have a match
-        } while (($this->byDay && !in_array($currentDay, $recurrenceDays)) || ($this->byHour && !in_array($currentHour, $recurrenceHours)));
-    }
-
-    /**
-     * Does the processing for advancing the iterator for monthly frequency.
-     *
-     * @return void
-     */
-    protected function nextMonthly() {
-
-        $currentDayOfMonth = $this->currentDate->format('j');
-        if (!$this->byMonthDay && !$this->byDay) {
-
-            // If the current day is higher than the 28th, rollover can
-            // occur to the next month. We Must skip these invalid
-            // entries.
-            if ($currentDayOfMonth < 29) {
-                $this->currentDate = $this->currentDate->modify('+' . $this->interval . ' months');
-            } else {
-                $increase = 0;
-                do {
-                    $increase++;
-                    $tempDate = clone $this->currentDate;
-                    $tempDate = $tempDate->modify('+ ' . ($this->interval * $increase) . ' months');
-                } while ($tempDate->format('j') != $currentDayOfMonth);
-                $this->currentDate = $tempDate;
-            }
-            return;
-        }
-
-        while (true) {
-
-            $occurrences = $this->getMonthlyOccurrences();
-
-            foreach ($occurrences as $occurrence) {
-
-                // The first occurrence thats higher than the current
-                // day of the month wins.
-                if ($occurrence > $currentDayOfMonth) {
-                    break 2;
-                }
-
-            }
-
-            // If we made it all the way here, it means there were no
-            // valid occurrences, and we need to advance to the next
-            // month.
-            //
-            // This line does not currently work in hhvm. Temporary workaround
-            // follows:
-            $this->currentDate = new DateTimeImmutable($this->currentDate->format('Y-m-1 H:i:s'), $this->currentDate->getTimezone());
-            // end of workaround
-            $this->currentDate = $this->currentDate->modify('+ ' . $this->interval . ' months');
-
-            // This goes to 0 because we need to start counting at the
-            // beginning.
-            $currentDayOfMonth = 0;
-
-        }
-
-        $this->currentDate = $this->currentDate->setDate(
-            (int)$this->currentDate->format('Y'),
-            (int)$this->currentDate->format('n'),
-            (int)$occurrence
-        );
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for yearly frequency.
-     *
-     * @return void
-     */
-    protected function nextYearly() {
-
-        $currentMonth = $this->currentDate->format('n');
-        $currentYear = $this->currentDate->format('Y');
-        $currentDayOfMonth = $this->currentDate->format('j');
-
-        // No sub-rules, so we just advance by year
-        if (empty($this->byMonth)) {
-
-            // Unless it was a leap day!
-            if ($currentMonth == 2 && $currentDayOfMonth == 29) {
-
-                $counter = 0;
-                do {
-                    $counter++;
-                    // Here we increase the year count by the interval, until
-                    // we hit a date that's also in a leap year.
-                    //
-                    // We could just find the next interval that's dividable by
-                    // 4, but that would ignore the rule that there's no leap
-                    // year every year that's dividable by a 100, but not by
-                    // 400. (1800, 1900, 2100). So we just rely on the datetime
-                    // functions instead.
-                    $nextDate = clone $this->currentDate;
-                    $nextDate = $nextDate->modify('+ ' . ($this->interval * $counter) . ' years');
-                } while ($nextDate->format('n') != 2);
-
-                $this->currentDate = $nextDate;
-
-                return;
-
-            }
-
-            // The easiest form
-            $this->currentDate = $this->currentDate->modify('+' . $this->interval . ' years');
-            return;
-
-        }
-
-        $currentMonth = $this->currentDate->format('n');
-        $currentYear = $this->currentDate->format('Y');
-        $currentDayOfMonth = $this->currentDate->format('j');
-
-        $advancedToNewMonth = false;
-
-        // If we got a byDay or getMonthDay filter, we must first expand
-        // further.
-        if ($this->byDay || $this->byMonthDay) {
-
-            while (true) {
-
-                $occurrences = $this->getMonthlyOccurrences();
-
-                foreach ($occurrences as $occurrence) {
-
-                    // The first occurrence that's higher than the current
-                    // day of the month wins.
-                    // If we advanced to the next month or year, the first
-                    // occurrence is always correct.
-                    if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
-                        break 2;
-                    }
-
-                }
-
-                // If we made it here, it means we need to advance to
-                // the next month or year.
-                $currentDayOfMonth = 1;
-                $advancedToNewMonth = true;
-                do {
-
-                    $currentMonth++;
-                    if ($currentMonth > 12) {
-                        $currentYear += $this->interval;
-                        $currentMonth = 1;
-                    }
-                } while (!in_array($currentMonth, $this->byMonth));
-
-                $this->currentDate = $this->currentDate->setDate(
-                    (int)$currentYear,
-                    (int)$currentMonth,
-                    (int)$currentDayOfMonth
-                );
-
-            }
-
-            // If we made it here, it means we got a valid occurrence
-            $this->currentDate = $this->currentDate->setDate(
-                (int)$currentYear,
-                (int)$currentMonth,
-                (int)$occurrence
-            );
-            return;
-
-        } else {
-
-            // These are the 'byMonth' rules, if there are no byDay or
-            // byMonthDay sub-rules.
-            do {
-
-                $currentMonth++;
-                if ($currentMonth > 12) {
-                    $currentYear += $this->interval;
-                    $currentMonth = 1;
-                }
-            } while (!in_array($currentMonth, $this->byMonth));
-            $this->currentDate = $this->currentDate->setDate(
-                (int)$currentYear,
-                (int)$currentMonth,
-                (int)$currentDayOfMonth
-            );
-
-            return;
-
-        }
-
-    }
-
-    /* }}} */
-
-    /**
-     * This method receives a string from an RRULE property, and populates this
-     * class with all the values.
-     *
-     * @param string|array $rrule
-     *
-     * @return void
-     */
-    protected function parseRRule($rrule) {
-
-        if (is_string($rrule)) {
-            $rrule = Property\ICalendar\Recur::stringToArray($rrule);
-        }
-
-        foreach ($rrule as $key => $value) {
-
-            $key = strtoupper($key);
-            switch ($key) {
-
-                case 'FREQ' :
-                    $value = strtolower($value);
-                    if (!in_array(
-                        $value,
-                        ['secondly', 'minutely', 'hourly', 'daily', 'weekly', 'monthly', 'yearly']
-                    )) {
-                        throw new InvalidDataException('Unknown value for FREQ=' . strtoupper($value));
-                    }
-                    $this->frequency = $value;
-                    break;
-
-                case 'UNTIL' :
-                    $this->until = DateTimeParser::parse($value, $this->startDate->getTimezone());
-
-                    // In some cases events are generated with an UNTIL=
-                    // parameter before the actual start of the event.
-                    //
-                    // Not sure why this is happening. We assume that the
-                    // intention was that the event only recurs once.
-                    //
-                    // So we are modifying the parameter so our code doesn't
-                    // break.
-                    if ($this->until < $this->startDate) {
-                        $this->until = $this->startDate;
-                    }
-                    break;
-
-                case 'INTERVAL' :
-                    // No break
-
-                case 'COUNT' :
-                    $val = (int)$value;
-                    if ($val < 1) {
-                        throw new InvalidDataException(strtoupper($key) . ' in RRULE must be a positive integer!');
-                    }
-                    $key = strtolower($key);
-                    $this->$key = $val;
-                    break;
-
-                case 'BYSECOND' :
-                    $this->bySecond = (array)$value;
-                    break;
-
-                case 'BYMINUTE' :
-                    $this->byMinute = (array)$value;
-                    break;
-
-                case 'BYHOUR' :
-                    $this->byHour = (array)$value;
-                    break;
-
-                case 'BYDAY' :
-                    $value = (array)$value;
-                    foreach ($value as $part) {
-                        if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $# xi', $part)) {
-                            throw new InvalidDataException('Invalid part in BYDAY clause: ' . $part);
-                        }
-                    }
-                    $this->byDay = $value;
-                    break;
-
-                case 'BYMONTHDAY' :
-                    $this->byMonthDay = (array)$value;
-                    break;
-
-                case 'BYYEARDAY' :
-                    $this->byYearDay = (array)$value;
-                    break;
-
-                case 'BYWEEKNO' :
-                    $this->byWeekNo = (array)$value;
-                    break;
-
-                case 'BYMONTH' :
-                    $this->byMonth = (array)$value;
-                    break;
-
-                case 'BYSETPOS' :
-                    $this->bySetPos = (array)$value;
-                    break;
-
-                case 'WKST' :
-                    $this->weekStart = strtoupper($value);
-                    break;
-
-                default:
-                    throw new InvalidDataException('Not supported: ' . strtoupper($key));
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Mappings between the day number and english day name.
-     *
-     * @var array
-     */
-    protected $dayNames = [
-        0 => 'Sunday',
-        1 => 'Monday',
-        2 => 'Tuesday',
-        3 => 'Wednesday',
-        4 => 'Thursday',
-        5 => 'Friday',
-        6 => 'Saturday',
-    ];
-
-    /**
-     * Returns all the occurrences for a monthly frequency with a 'byDay' or
-     * 'byMonthDay' expansion for the current month.
-     *
-     * The returned list is an array of integers with the day of month (1-31).
-     *
-     * @return array
-     */
-    protected function getMonthlyOccurrences() {
-
-        $startDate = clone $this->currentDate;
-
-        $byDayResults = [];
-
-        // Our strategy is to simply go through the byDays, advance the date to
-        // that point and add it to the results.
-        if ($this->byDay) foreach ($this->byDay as $day) {
-
-            $dayName = $this->dayNames[$this->dayMap[substr($day, -2)]];
-
-
-            // Dayname will be something like 'wednesday'. Now we need to find
-            // all wednesdays in this month.
-            $dayHits = [];
-
-            // workaround for missing 'first day of the month' support in hhvm
-            $checkDate = new \DateTime($startDate->format('Y-m-1'));
-            // workaround modify always advancing the date even if the current day is a $dayName in hhvm
-            if ($checkDate->format('l') !== $dayName) {
-                $checkDate = $checkDate->modify($dayName);
-            }
-
-            do {
-                $dayHits[] = $checkDate->format('j');
-                $checkDate = $checkDate->modify('next ' . $dayName);
-            } while ($checkDate->format('n') === $startDate->format('n'));
-
-            // So now we have 'all wednesdays' for month. It is however
-            // possible that the user only really wanted the 1st, 2nd or last
-            // wednesday.
-            if (strlen($day) > 2) {
-                $offset = (int)substr($day, 0, -2);
-
-                if ($offset > 0) {
-                    // It is possible that the day does not exist, such as a
-                    // 5th or 6th wednesday of the month.
-                    if (isset($dayHits[$offset - 1])) {
-                        $byDayResults[] = $dayHits[$offset - 1];
-                    }
-                } else {
-
-                    // if it was negative we count from the end of the array
-                    // might not exist, fx. -5th tuesday
-                    if (isset($dayHits[count($dayHits) + $offset])) {
-                        $byDayResults[] = $dayHits[count($dayHits) + $offset];
-                    }
-                }
-            } else {
-                // There was no counter (first, second, last wednesdays), so we
-                // just need to add the all to the list).
-                $byDayResults = array_merge($byDayResults, $dayHits);
-
-            }
-
-        }
-
-        $byMonthDayResults = [];
-        if ($this->byMonthDay) foreach ($this->byMonthDay as $monthDay) {
-
-            // Removing values that are out of range for this month
-            if ($monthDay > $startDate->format('t') ||
-                $monthDay < 0 - $startDate->format('t')) {
-                    continue;
-            }
-            if ($monthDay > 0) {
-                $byMonthDayResults[] = $monthDay;
-            } else {
-                // Negative values
-                $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
-            }
-        }
-
-        // If there was just byDay or just byMonthDay, they just specify our
-        // (almost) final list. If both were provided, then byDay limits the
-        // list.
-        if ($this->byMonthDay && $this->byDay) {
-            $result = array_intersect($byMonthDayResults, $byDayResults);
-        } elseif ($this->byMonthDay) {
-            $result = $byMonthDayResults;
-        } else {
-            $result = $byDayResults;
-        }
-        $result = array_unique($result);
-        sort($result, SORT_NUMERIC);
-
-        // The last thing that needs checking is the BYSETPOS. If it's set, it
-        // means only certain items in the set survive the filter.
-        if (!$this->bySetPos) {
-            return $result;
-        }
-
-        $filteredResult = [];
-        foreach ($this->bySetPos as $setPos) {
-
-            if ($setPos < 0) {
-                $setPos = count($result) + ($setPos + 1);
-            }
-            if (isset($result[$setPos - 1])) {
-                $filteredResult[] = $result[$setPos - 1];
-            }
-        }
-
-        sort($filteredResult, SORT_NUMERIC);
-        return $filteredResult;
-
-    }
-
-    /**
-     * Simple mapping from iCalendar day names to day numbers.
-     *
-     * @var array
-     */
-    protected $dayMap = [
-        'SU' => 0,
-        'MO' => 1,
-        'TU' => 2,
-        'WE' => 3,
-        'TH' => 4,
-        'FR' => 5,
-        'SA' => 6,
-    ];
-
-    protected function getHours() {
-
-        $recurrenceHours = [];
-        foreach ($this->byHour as $byHour) {
-            $recurrenceHours[] = $byHour;
-        }
-
-        return $recurrenceHours;
-    }
-
-    protected function getDays() {
-
-        $recurrenceDays = [];
-        foreach ($this->byDay as $byDay) {
-
-            // The day may be preceeded with a positive (+n) or
-            // negative (-n) integer. However, this does not make
-            // sense in 'weekly' so we ignore it here.
-            $recurrenceDays[] = $this->dayMap[substr($byDay, -2)];
-
-        }
-
-        return $recurrenceDays;
-    }
-
-    protected function getMonths() {
-
-        $recurrenceMonths = [];
-        foreach ($this->byMonth as $byMonth) {
-            $recurrenceMonths[] = $byMonth;
-        }
-
-        return $recurrenceMonths;
-    }
+		return $this->counter;
+
+	}
+
+	/**
+	 * Returns whether the current item is a valid item for the recurrence
+	 * iterator. This will return false if we've gone beyond the UNTIL or COUNT
+	 * statements.
+	 *
+	 * @return bool
+	 */
+	public function valid() {
+
+		if (!is_null($this->count)) {
+			return $this->counter < $this->count;
+		}
+		return is_null($this->until) || $this->currentDate <= $this->until;
+
+	}
+
+	/**
+	 * Resets the iterator.
+	 *
+	 * @return void
+	 */
+	public function rewind() {
+
+		$this->currentDate = clone $this->startDate;
+		$this->counter = 0;
+
+	}
+
+	/**
+	 * Goes on to the next iteration.
+	 *
+	 * @return void
+	 */
+	public function next() {
+
+		// Otherwise, we find the next event in the normal RRULE
+		// sequence.
+		switch ($this->frequency) {
+
+			case 'hourly' :
+				$this->nextHourly();
+				break;
+
+			case 'daily' :
+				$this->nextDaily();
+				break;
+
+			case 'weekly' :
+				$this->nextWeekly();
+				break;
+
+			case 'monthly' :
+				$this->nextMonthly();
+				break;
+
+			case 'yearly' :
+				$this->nextYearly();
+				break;
+
+		}
+		$this->counter++;
+
+	}
+
+	/* End of Iterator implementation }}} */
+
+	/**
+	 * Returns true if this recurring event never ends.
+	 *
+	 * @return bool
+	 */
+	public function isInfinite() {
+
+		return !$this->count && !$this->until;
+
+	}
+
+	/**
+	 * This method allows you to quickly go to the next occurrence after the
+	 * specified date.
+	 *
+	 * @param DateTimeInterface $dt
+	 *
+	 * @return void
+	 */
+	public function fastForward(DateTimeInterface $dt) {
+
+		while ($this->valid() && $this->currentDate < $dt) {
+			$this->next();
+		}
+
+	}
+
+	/**
+	 * The reference start date/time for the rrule.
+	 *
+	 * All calculations are based on this initial date.
+	 *
+	 * @var DateTimeInterface
+	 */
+	protected $startDate;
+
+	/**
+	 * The date of the current iteration. You can get this by calling
+	 * ->current().
+	 *
+	 * @var DateTimeInterface
+	 */
+	protected $currentDate;
+
+	/**
+	 * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
+	 * yearly.
+	 *
+	 * @var string
+	 */
+	protected $frequency;
+
+	/**
+	 * The number of recurrences, or 'null' if infinitely recurring.
+	 *
+	 * @var int
+	 */
+	protected $count;
+
+	/**
+	 * The interval.
+	 *
+	 * If for example frequency is set to daily, interval = 2 would mean every
+	 * 2 days.
+	 *
+	 * @var int
+	 */
+	protected $interval = 1;
+
+	/**
+	 * The last instance of this recurrence, inclusively.
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	protected $until;
+
+	/**
+	 * Which seconds to recur.
+	 *
+	 * This is an array of integers (between 0 and 60)
+	 *
+	 * @var array
+	 */
+	protected $bySecond;
+
+	/**
+	 * Which minutes to recur.
+	 *
+	 * This is an array of integers (between 0 and 59)
+	 *
+	 * @var array
+	 */
+	protected $byMinute;
+
+	/**
+	 * Which hours to recur.
+	 *
+	 * This is an array of integers (between 0 and 23)
+	 *
+	 * @var array
+	 */
+	protected $byHour;
+
+	/**
+	 * The current item in the list.
+	 *
+	 * You can get this number with the key() method.
+	 *
+	 * @var int
+	 */
+	protected $counter = 0;
+
+	/**
+	 * Which weekdays to recur.
+	 *
+	 * This is an array of weekdays
+	 *
+	 * This may also be preceeded by a positive or negative integer. If present,
+	 * this indicates the nth occurrence of a specific day within the monthly or
+	 * yearly rrule. For instance, -2TU indicates the second-last tuesday of
+	 * the month, or year.
+	 *
+	 * @var array
+	 */
+	protected $byDay;
+
+	/**
+	 * Which days of the month to recur.
+	 *
+	 * This is an array of days of the months (1-31). The value can also be
+	 * negative. -5 for instance means the 5th last day of the month.
+	 *
+	 * @var array
+	 */
+	protected $byMonthDay;
+
+	/**
+	 * Which days of the year to recur.
+	 *
+	 * This is an array with days of the year (1 to 366). The values can also
+	 * be negative. For instance, -1 will always represent the last day of the
+	 * year. (December 31st).
+	 *
+	 * @var array
+	 */
+	protected $byYearDay;
+
+	/**
+	 * Which week numbers to recur.
+	 *
+	 * This is an array of integers from 1 to 53. The values can also be
+	 * negative. -1 will always refer to the last week of the year.
+	 *
+	 * @var array
+	 */
+	protected $byWeekNo;
+
+	/**
+	 * Which months to recur.
+	 *
+	 * This is an array of integers from 1 to 12.
+	 *
+	 * @var array
+	 */
+	protected $byMonth;
+
+	/**
+	 * Which items in an existing st to recur.
+	 *
+	 * These numbers work together with an existing by* rule. It specifies
+	 * exactly which items of the existing by-rule to filter.
+	 *
+	 * Valid values are 1 to 366 and -1 to -366. As an example, this can be
+	 * used to recur the last workday of the month.
+	 *
+	 * This would be done by setting frequency to 'monthly', byDay to
+	 * 'MO,TU,WE,TH,FR' and bySetPos to -1.
+	 *
+	 * @var array
+	 */
+	protected $bySetPos;
+
+	/**
+	 * When the week starts.
+	 *
+	 * @var string
+	 */
+	protected $weekStart = 'MO';
+
+	/* Functions that advance the iterator {{{ */
+
+	/**
+	 * Does the processing for advancing the iterator for hourly frequency.
+	 *
+	 * @return void
+	 */
+	protected function nextHourly() {
+
+		$this->currentDate = $this->currentDate->modify('+' . $this->interval . ' hours');
+
+	}
+
+	/**
+	 * Does the processing for advancing the iterator for daily frequency.
+	 *
+	 * @return void
+	 */
+	protected function nextDaily() {
+
+		if (!$this->byHour && !$this->byDay) {
+			$this->currentDate = $this->currentDate->modify('+' . $this->interval . ' days');
+			return;
+		}
+
+		if (!empty($this->byHour)) {
+			$recurrenceHours = $this->getHours();
+		}
+
+		if (!empty($this->byDay)) {
+			$recurrenceDays = $this->getDays();
+		}
+
+		if (!empty($this->byMonth)) {
+			$recurrenceMonths = $this->getMonths();
+		}
+
+		do {
+			if ($this->byHour) {
+				if ($this->currentDate->format('G') == '23') {
+					// to obey the interval rule
+					$this->currentDate = $this->currentDate->modify('+' . $this->interval - 1 . ' days');
+				}
+
+				$this->currentDate = $this->currentDate->modify('+1 hours');
+
+			} else {
+				$this->currentDate = $this->currentDate->modify('+' . $this->interval . ' days');
+
+			}
+
+			// Current month of the year
+			$currentMonth = $this->currentDate->format('n');
+
+			// Current day of the week
+			$currentDay = $this->currentDate->format('w');
+
+			// Current hour of the day
+			$currentHour = $this->currentDate->format('G');
+
+		} while (
+			($this->byDay   && !in_array($currentDay, $recurrenceDays)) ||
+			($this->byHour  && !in_array($currentHour, $recurrenceHours)) ||
+			($this->byMonth && !in_array($currentMonth, $recurrenceMonths))
+		);
+
+	}
+
+	/**
+	 * Does the processing for advancing the iterator for weekly frequency.
+	 *
+	 * @return void
+	 */
+	protected function nextWeekly() {
+
+		if (!$this->byHour && !$this->byDay) {
+			$this->currentDate = $this->currentDate->modify('+' . $this->interval . ' weeks');
+			return;
+		}
+
+		if ($this->byHour) {
+			$recurrenceHours = $this->getHours();
+		}
+
+		if ($this->byDay) {
+			$recurrenceDays = $this->getDays();
+		}
+
+		// First day of the week:
+		$firstDay = $this->dayMap[$this->weekStart];
+
+		do {
+
+			if ($this->byHour) {
+				$this->currentDate = $this->currentDate->modify('+1 hours');
+			} else {
+				$this->currentDate = $this->currentDate->modify('+1 days');
+			}
+
+			// Current day of the week
+			$currentDay = (int)$this->currentDate->format('w');
+
+			// Current hour of the day
+			$currentHour = (int)$this->currentDate->format('G');
+
+			// We need to roll over to the next week
+			if ($currentDay === $firstDay && (!$this->byHour || $currentHour == '0')) {
+				$this->currentDate = $this->currentDate->modify('+' . $this->interval - 1 . ' weeks');
+
+				// We need to go to the first day of this week, but only if we
+				// are not already on this first day of this week.
+				if ($this->currentDate->format('w') != $firstDay) {
+					$this->currentDate = $this->currentDate->modify('last ' . $this->dayNames[$this->dayMap[$this->weekStart]]);
+				}
+			}
+
+			// We have a match
+		} while (($this->byDay && !in_array($currentDay, $recurrenceDays)) || ($this->byHour && !in_array($currentHour, $recurrenceHours)));
+	}
+
+	/**
+	 * Does the processing for advancing the iterator for monthly frequency.
+	 *
+	 * @return void
+	 */
+	protected function nextMonthly() {
+
+		$currentDayOfMonth = $this->currentDate->format('j');
+		if (!$this->byMonthDay && !$this->byDay) {
+
+			// If the current day is higher than the 28th, rollover can
+			// occur to the next month. We Must skip these invalid
+			// entries.
+			if ($currentDayOfMonth < 29) {
+				$this->currentDate = $this->currentDate->modify('+' . $this->interval . ' months');
+			} else {
+				$increase = 0;
+				do {
+					$increase++;
+					$tempDate = clone $this->currentDate;
+					$tempDate = $tempDate->modify('+ ' . ($this->interval * $increase) . ' months');
+				} while ($tempDate->format('j') != $currentDayOfMonth);
+				$this->currentDate = $tempDate;
+			}
+			return;
+		}
+
+		while (true) {
+
+			$occurrences = $this->getMonthlyOccurrences();
+
+			foreach ($occurrences as $occurrence) {
+
+				// The first occurrence thats higher than the current
+				// day of the month wins.
+				if ($occurrence > $currentDayOfMonth) {
+					break 2;
+				}
+
+			}
+
+			// If we made it all the way here, it means there were no
+			// valid occurrences, and we need to advance to the next
+			// month.
+			//
+			// This line does not currently work in hhvm. Temporary workaround
+			// follows:
+			$this->currentDate = new DateTimeImmutable($this->currentDate->format('Y-m-1 H:i:s'), $this->currentDate->getTimezone());
+			// end of workaround
+			$this->currentDate = $this->currentDate->modify('+ ' . $this->interval . ' months');
+
+			// This goes to 0 because we need to start counting at the
+			// beginning.
+			$currentDayOfMonth = 0;
+
+		}
+
+		$this->currentDate = $this->currentDate->setDate(
+			(int)$this->currentDate->format('Y'),
+			(int)$this->currentDate->format('n'),
+			(int)$occurrence
+		);
+
+	}
+
+	/**
+	 * Does the processing for advancing the iterator for yearly frequency.
+	 *
+	 * @return void
+	 */
+	protected function nextYearly() {
+
+		$currentMonth = $this->currentDate->format('n');
+		$currentYear = $this->currentDate->format('Y');
+		$currentDayOfMonth = $this->currentDate->format('j');
+
+		// No sub-rules, so we just advance by year
+		if (empty($this->byMonth)) {
+
+			// Unless it was a leap day!
+			if ($currentMonth == 2 && $currentDayOfMonth == 29) {
+
+				$counter = 0;
+				do {
+					$counter++;
+					// Here we increase the year count by the interval, until
+					// we hit a date that's also in a leap year.
+					//
+					// We could just find the next interval that's dividable by
+					// 4, but that would ignore the rule that there's no leap
+					// year every year that's dividable by a 100, but not by
+					// 400. (1800, 1900, 2100). So we just rely on the datetime
+					// functions instead.
+					$nextDate = clone $this->currentDate;
+					$nextDate = $nextDate->modify('+ ' . ($this->interval * $counter) . ' years');
+				} while ($nextDate->format('n') != 2);
+
+				$this->currentDate = $nextDate;
+
+				return;
+
+			}
+
+			// The easiest form
+			$this->currentDate = $this->currentDate->modify('+' . $this->interval . ' years');
+			return;
+
+		}
+
+		$currentMonth = $this->currentDate->format('n');
+		$currentYear = $this->currentDate->format('Y');
+		$currentDayOfMonth = $this->currentDate->format('j');
+
+		$advancedToNewMonth = false;
+
+		// If we got a byDay or getMonthDay filter, we must first expand
+		// further.
+		if ($this->byDay || $this->byMonthDay) {
+
+			while (true) {
+
+				$occurrences = $this->getMonthlyOccurrences();
+
+				foreach ($occurrences as $occurrence) {
+
+					// The first occurrence that's higher than the current
+					// day of the month wins.
+					// If we advanced to the next month or year, the first
+					// occurrence is always correct.
+					if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
+						break 2;
+					}
+
+				}
+
+				// If we made it here, it means we need to advance to
+				// the next month or year.
+				$currentDayOfMonth = 1;
+				$advancedToNewMonth = true;
+				do {
+
+					$currentMonth++;
+					if ($currentMonth > 12) {
+						$currentYear += $this->interval;
+						$currentMonth = 1;
+					}
+				} while (!in_array($currentMonth, $this->byMonth));
+
+				$this->currentDate = $this->currentDate->setDate(
+					(int)$currentYear,
+					(int)$currentMonth,
+					(int)$currentDayOfMonth
+				);
+
+			}
+
+			// If we made it here, it means we got a valid occurrence
+			$this->currentDate = $this->currentDate->setDate(
+				(int)$currentYear,
+				(int)$currentMonth,
+				(int)$occurrence
+			);
+			return;
+
+		} else {
+
+			// These are the 'byMonth' rules, if there are no byDay or
+			// byMonthDay sub-rules.
+			do {
+
+				$currentMonth++;
+				if ($currentMonth > 12) {
+					$currentYear += $this->interval;
+					$currentMonth = 1;
+				}
+			} while (!in_array($currentMonth, $this->byMonth));
+			$this->currentDate = $this->currentDate->setDate(
+				(int)$currentYear,
+				(int)$currentMonth,
+				(int)$currentDayOfMonth
+			);
+
+			return;
+
+		}
+
+	}
+
+	/* }}} */
+
+	/**
+	 * This method receives a string from an RRULE property, and populates this
+	 * class with all the values.
+	 *
+	 * @param string|array $rrule
+	 *
+	 * @return void
+	 */
+	protected function parseRRule($rrule) {
+
+		if (is_string($rrule)) {
+			$rrule = Property\ICalendar\Recur::stringToArray($rrule);
+		}
+
+		foreach ($rrule as $key => $value) {
+
+			$key = strtoupper($key);
+			switch ($key) {
+
+				case 'FREQ' :
+					$value = strtolower($value);
+					if (!in_array(
+						$value,
+						['secondly', 'minutely', 'hourly', 'daily', 'weekly', 'monthly', 'yearly']
+					)) {
+						throw new InvalidDataException('Unknown value for FREQ=' . strtoupper($value));
+					}
+					$this->frequency = $value;
+					break;
+
+				case 'UNTIL' :
+					$this->until = DateTimeParser::parse($value, $this->startDate->getTimezone());
+
+					// In some cases events are generated with an UNTIL=
+					// parameter before the actual start of the event.
+					//
+					// Not sure why this is happening. We assume that the
+					// intention was that the event only recurs once.
+					//
+					// So we are modifying the parameter so our code doesn't
+					// break.
+					if ($this->until < $this->startDate) {
+						$this->until = $this->startDate;
+					}
+					break;
+
+				case 'INTERVAL' :
+					// No break
+
+				case 'COUNT' :
+					$val = (int)$value;
+					if ($val < 1) {
+						throw new InvalidDataException(strtoupper($key) . ' in RRULE must be a positive integer!');
+					}
+					$key = strtolower($key);
+					$this->$key = $val;
+					break;
+
+				case 'BYSECOND' :
+					$this->bySecond = (array)$value;
+					break;
+
+				case 'BYMINUTE' :
+					$this->byMinute = (array)$value;
+					break;
+
+				case 'BYHOUR' :
+					$this->byHour = (array)$value;
+					break;
+
+				case 'BYDAY' :
+					$value = (array)$value;
+					foreach ($value as $part) {
+						if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $# xi', $part)) {
+							throw new InvalidDataException('Invalid part in BYDAY clause: ' . $part);
+						}
+					}
+					$this->byDay = $value;
+					break;
+
+				case 'BYMONTHDAY' :
+					$this->byMonthDay = (array)$value;
+					break;
+
+				case 'BYYEARDAY' :
+					$this->byYearDay = (array)$value;
+					break;
+
+				case 'BYWEEKNO' :
+					$this->byWeekNo = (array)$value;
+					break;
+
+				case 'BYMONTH' :
+					$this->byMonth = (array)$value;
+					break;
+
+				case 'BYSETPOS' :
+					$this->bySetPos = (array)$value;
+					break;
+
+				case 'WKST' :
+					$this->weekStart = strtoupper($value);
+					break;
+
+				default:
+					throw new InvalidDataException('Not supported: ' . strtoupper($key));
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Mappings between the day number and english day name.
+	 *
+	 * @var array
+	 */
+	protected $dayNames = [
+		0 => 'Sunday',
+		1 => 'Monday',
+		2 => 'Tuesday',
+		3 => 'Wednesday',
+		4 => 'Thursday',
+		5 => 'Friday',
+		6 => 'Saturday',
+	];
+
+	/**
+	 * Returns all the occurrences for a monthly frequency with a 'byDay' or
+	 * 'byMonthDay' expansion for the current month.
+	 *
+	 * The returned list is an array of integers with the day of month (1-31).
+	 *
+	 * @return array
+	 */
+	protected function getMonthlyOccurrences() {
+
+		$startDate = clone $this->currentDate;
+
+		$byDayResults = [];
+
+		// Our strategy is to simply go through the byDays, advance the date to
+		// that point and add it to the results.
+		if ($this->byDay) foreach ($this->byDay as $day) {
+
+			$dayName = $this->dayNames[$this->dayMap[substr($day, -2)]];
+
+
+			// Dayname will be something like 'wednesday'. Now we need to find
+			// all wednesdays in this month.
+			$dayHits = [];
+
+			// workaround for missing 'first day of the month' support in hhvm
+			$checkDate = new \DateTime($startDate->format('Y-m-1'));
+			// workaround modify always advancing the date even if the current day is a $dayName in hhvm
+			if ($checkDate->format('l') !== $dayName) {
+				$checkDate = $checkDate->modify($dayName);
+			}
+
+			do {
+				$dayHits[] = $checkDate->format('j');
+				$checkDate = $checkDate->modify('next ' . $dayName);
+			} while ($checkDate->format('n') === $startDate->format('n'));
+
+			// So now we have 'all wednesdays' for month. It is however
+			// possible that the user only really wanted the 1st, 2nd or last
+			// wednesday.
+			if (strlen($day) > 2) {
+				$offset = (int)substr($day, 0, -2);
+
+				if ($offset > 0) {
+					// It is possible that the day does not exist, such as a
+					// 5th or 6th wednesday of the month.
+					if (isset($dayHits[$offset - 1])) {
+						$byDayResults[] = $dayHits[$offset - 1];
+					}
+				} else {
+
+					// if it was negative we count from the end of the array
+					// might not exist, fx. -5th tuesday
+					if (isset($dayHits[count($dayHits) + $offset])) {
+						$byDayResults[] = $dayHits[count($dayHits) + $offset];
+					}
+				}
+			} else {
+				// There was no counter (first, second, last wednesdays), so we
+				// just need to add the all to the list).
+				$byDayResults = array_merge($byDayResults, $dayHits);
+
+			}
+
+		}
+
+		$byMonthDayResults = [];
+		if ($this->byMonthDay) foreach ($this->byMonthDay as $monthDay) {
+
+			// Removing values that are out of range for this month
+			if ($monthDay > $startDate->format('t') ||
+				$monthDay < 0 - $startDate->format('t')) {
+					continue;
+			}
+			if ($monthDay > 0) {
+				$byMonthDayResults[] = $monthDay;
+			} else {
+				// Negative values
+				$byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
+			}
+		}
+
+		// If there was just byDay or just byMonthDay, they just specify our
+		// (almost) final list. If both were provided, then byDay limits the
+		// list.
+		if ($this->byMonthDay && $this->byDay) {
+			$result = array_intersect($byMonthDayResults, $byDayResults);
+		} elseif ($this->byMonthDay) {
+			$result = $byMonthDayResults;
+		} else {
+			$result = $byDayResults;
+		}
+		$result = array_unique($result);
+		sort($result, SORT_NUMERIC);
+
+		// The last thing that needs checking is the BYSETPOS. If it's set, it
+		// means only certain items in the set survive the filter.
+		if (!$this->bySetPos) {
+			return $result;
+		}
+
+		$filteredResult = [];
+		foreach ($this->bySetPos as $setPos) {
+
+			if ($setPos < 0) {
+				$setPos = count($result) + ($setPos + 1);
+			}
+			if (isset($result[$setPos - 1])) {
+				$filteredResult[] = $result[$setPos - 1];
+			}
+		}
+
+		sort($filteredResult, SORT_NUMERIC);
+		return $filteredResult;
+
+	}
+
+	/**
+	 * Simple mapping from iCalendar day names to day numbers.
+	 *
+	 * @var array
+	 */
+	protected $dayMap = [
+		'SU' => 0,
+		'MO' => 1,
+		'TU' => 2,
+		'WE' => 3,
+		'TH' => 4,
+		'FR' => 5,
+		'SA' => 6,
+	];
+
+	protected function getHours() {
+
+		$recurrenceHours = [];
+		foreach ($this->byHour as $byHour) {
+			$recurrenceHours[] = $byHour;
+		}
+
+		return $recurrenceHours;
+	}
+
+	protected function getDays() {
+
+		$recurrenceDays = [];
+		foreach ($this->byDay as $byDay) {
+
+			// The day may be preceeded with a positive (+n) or
+			// negative (-n) integer. However, this does not make
+			// sense in 'weekly' so we ignore it here.
+			$recurrenceDays[] = $this->dayMap[substr($byDay, -2)];
+
+		}
+
+		return $recurrenceDays;
+	}
+
+	protected function getMonths() {
+
+		$recurrenceMonths = [];
+		foreach ($this->byMonth as $byMonth) {
+			$recurrenceMonths[] = $byMonth;
+		}
+
+		return $recurrenceMonths;
+	}
 }

Braces +9 added lines, -3 removed lines

@@ -42,7 +42,9 @@ 
 
     public function current() {
 
-        if (!$this->valid()) return;
+        if (!$this->valid()) {
+        	return;
+        }
         return clone $this->currentDate;
 
     }
@@ -767,9 +769,11 @@ 
 
         // Our strategy is to simply go through the byDays, advance the date to
         // that point and add it to the results.
-        if ($this->byDay) foreach ($this->byDay as $day) {
+        if ($this->byDay) {
+        	foreach ($this->byDay as $day) {
 
             $dayName = $this->dayNames[$this->dayMap[substr($day, -2)]];
+        }
 
 
             // Dayname will be something like 'wednesday'. Now we need to find
@@ -818,12 +822,14 @@ 
         }
 
         $byMonthDayResults = [];
-        if ($this->byMonthDay) foreach ($this->byMonthDay as $monthDay) {
+        if ($this->byMonthDay) {
+        	foreach ($this->byMonthDay as $monthDay) {
 
             // Removing values that are out of range for this month
             if ($monthDay > $startDate->format('t') ||
                 $monthDay < 0 - $startDate->format('t')) {
                     continue;
+        }
             }
             if ($monthDay > 0) {
                 $byMonthDayResults[] = $monthDay;