Dolibarr / dolibarr

htdocs/includes/sabre/sabre/vobject/lib/Component/VAlarm.php

Indentation +105 added lines, -105 removed lines

@@ -18,121 +18,121 @@
  */
 class VAlarm extends VObject\Component
 {
-    /**
-     * Returns a DateTime object when this alarm is going to trigger.
-     *
-     * This ignores repeated alarm, only the first trigger is returned.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getEffectiveTriggerTime()
-    {
-        $trigger = $this->TRIGGER;
-        if (!isset($trigger['VALUE']) || 'DURATION' === strtoupper($trigger['VALUE'])) {
-            $triggerDuration = VObject\DateTimeParser::parseDuration($this->TRIGGER);
-            $related = (isset($trigger['RELATED']) && 'END' == strtoupper($trigger['RELATED'])) ? 'END' : 'START';
+	/**
+	 * Returns a DateTime object when this alarm is going to trigger.
+	 *
+	 * This ignores repeated alarm, only the first trigger is returned.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getEffectiveTriggerTime()
+	{
+		$trigger = $this->TRIGGER;
+		if (!isset($trigger['VALUE']) || 'DURATION' === strtoupper($trigger['VALUE'])) {
+			$triggerDuration = VObject\DateTimeParser::parseDuration($this->TRIGGER);
+			$related = (isset($trigger['RELATED']) && 'END' == strtoupper($trigger['RELATED'])) ? 'END' : 'START';
 
-            $parentComponent = $this->parent;
-            if ('START' === $related) {
-                if ('VTODO' === $parentComponent->name) {
-                    $propName = 'DUE';
-                } else {
-                    $propName = 'DTSTART';
-                }
+			$parentComponent = $this->parent;
+			if ('START' === $related) {
+				if ('VTODO' === $parentComponent->name) {
+					$propName = 'DUE';
+				} else {
+					$propName = 'DTSTART';
+				}
 
-                $effectiveTrigger = $parentComponent->$propName->getDateTime();
-                $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
-            } else {
-                if ('VTODO' === $parentComponent->name) {
-                    $endProp = 'DUE';
-                } elseif ('VEVENT' === $parentComponent->name) {
-                    $endProp = 'DTEND';
-                } else {
-                    throw new InvalidDataException('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
-                }
+				$effectiveTrigger = $parentComponent->$propName->getDateTime();
+				$effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+			} else {
+				if ('VTODO' === $parentComponent->name) {
+					$endProp = 'DUE';
+				} elseif ('VEVENT' === $parentComponent->name) {
+					$endProp = 'DTEND';
+				} else {
+					throw new InvalidDataException('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
+				}
 
-                if (isset($parentComponent->$endProp)) {
-                    $effectiveTrigger = $parentComponent->$endProp->getDateTime();
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
-                } elseif (isset($parentComponent->DURATION)) {
-                    $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
-                    $duration = VObject\DateTimeParser::parseDuration($parentComponent->DURATION);
-                    $effectiveTrigger = $effectiveTrigger->add($duration);
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
-                } else {
-                    $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
-                }
-            }
-        } else {
-            $effectiveTrigger = $trigger->getDateTime();
-        }
+				if (isset($parentComponent->$endProp)) {
+					$effectiveTrigger = $parentComponent->$endProp->getDateTime();
+					$effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+				} elseif (isset($parentComponent->DURATION)) {
+					$effectiveTrigger = $parentComponent->DTSTART->getDateTime();
+					$duration = VObject\DateTimeParser::parseDuration($parentComponent->DURATION);
+					$effectiveTrigger = $effectiveTrigger->add($duration);
+					$effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+				} else {
+					$effectiveTrigger = $parentComponent->DTSTART->getDateTime();
+					$effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+				}
+			}
+		} else {
+			$effectiveTrigger = $trigger->getDateTime();
+		}
 
-        return $effectiveTrigger;
-    }
+		return $effectiveTrigger;
+	}
 
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
-    {
-        $effectiveTrigger = $this->getEffectiveTriggerTime();
+	/**
+	 * Returns true or false depending on if the event falls in the specified
+	 * time-range. This is used for filtering purposes.
+	 *
+	 * The rules used to determine if an event falls within the specified
+	 * time-range is based on the CalDAV specification.
+	 *
+	 * @param DateTime $start
+	 * @param DateTime $end
+	 *
+	 * @return bool
+	 */
+	public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
+	{
+		$effectiveTrigger = $this->getEffectiveTriggerTime();
 
-        if (isset($this->DURATION)) {
-            $duration = VObject\DateTimeParser::parseDuration($this->DURATION);
-            $repeat = (string) $this->REPEAT;
-            if (!$repeat) {
-                $repeat = 1;
-            }
+		if (isset($this->DURATION)) {
+			$duration = VObject\DateTimeParser::parseDuration($this->DURATION);
+			$repeat = (string) $this->REPEAT;
+			if (!$repeat) {
+				$repeat = 1;
+			}
 
-            $period = new \DatePeriod($effectiveTrigger, $duration, (int) $repeat);
+			$period = new \DatePeriod($effectiveTrigger, $duration, (int) $repeat);
 
-            foreach ($period as $occurrence) {
-                if ($start <= $occurrence && $end > $occurrence) {
-                    return true;
-                }
-            }
+			foreach ($period as $occurrence) {
+				if ($start <= $occurrence && $end > $occurrence) {
+					return true;
+				}
+			}
 
-            return false;
-        } else {
-            return $start <= $effectiveTrigger && $end > $effectiveTrigger;
-        }
-    }
+			return false;
+		} else {
+			return $start <= $effectiveTrigger && $end > $effectiveTrigger;
+		}
+	}
 
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules()
-    {
-        return [
-            'ACTION' => 1,
-            'TRIGGER' => 1,
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules()
+	{
+		return [
+			'ACTION' => 1,
+			'TRIGGER' => 1,
 
-            'DURATION' => '?',
-            'REPEAT' => '?',
+			'DURATION' => '?',
+			'REPEAT' => '?',
 
-            'ATTACH' => '?',
-        ];
-    }
+			'ATTACH' => '?',
+		];
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Component/VTodo.php

Indentation +151 added lines, -151 removed lines

@@ -16,166 +16,166 @@
  */
 class VTodo extends VObject\Component
 {
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
-    {
-        $dtstart = isset($this->DTSTART) ? $this->DTSTART->getDateTime() : null;
-        $duration = isset($this->DURATION) ? VObject\DateTimeParser::parseDuration($this->DURATION) : null;
-        $due = isset($this->DUE) ? $this->DUE->getDateTime() : null;
-        $completed = isset($this->COMPLETED) ? $this->COMPLETED->getDateTime() : null;
-        $created = isset($this->CREATED) ? $this->CREATED->getDateTime() : null;
+	/**
+	 * Returns true or false depending on if the event falls in the specified
+	 * time-range. This is used for filtering purposes.
+	 *
+	 * The rules used to determine if an event falls within the specified
+	 * time-range is based on the CalDAV specification.
+	 *
+	 * @return bool
+	 */
+	public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
+	{
+		$dtstart = isset($this->DTSTART) ? $this->DTSTART->getDateTime() : null;
+		$duration = isset($this->DURATION) ? VObject\DateTimeParser::parseDuration($this->DURATION) : null;
+		$due = isset($this->DUE) ? $this->DUE->getDateTime() : null;
+		$completed = isset($this->COMPLETED) ? $this->COMPLETED->getDateTime() : null;
+		$created = isset($this->CREATED) ? $this->CREATED->getDateTime() : null;
 
-        if ($dtstart) {
-            if ($duration) {
-                $effectiveEnd = $dtstart->add($duration);
+		if ($dtstart) {
+			if ($duration) {
+				$effectiveEnd = $dtstart->add($duration);
 
-                return $start <= $effectiveEnd && $end > $dtstart;
-            } elseif ($due) {
-                return
-                    ($start < $due || $start <= $dtstart) &&
-                    ($end > $dtstart || $end >= $due);
-            } else {
-                return $start <= $dtstart && $end > $dtstart;
-            }
-        }
-        if ($due) {
-            return $start < $due && $end >= $due;
-        }
-        if ($completed && $created) {
-            return
-                ($start <= $created || $start <= $completed) &&
-                ($end >= $created || $end >= $completed);
-        }
-        if ($completed) {
-            return $start <= $completed && $end >= $completed;
-        }
-        if ($created) {
-            return $end > $created;
-        }
+				return $start <= $effectiveEnd && $end > $dtstart;
+			} elseif ($due) {
+				return
+					($start < $due || $start <= $dtstart) &&
+					($end > $dtstart || $end >= $due);
+			} else {
+				return $start <= $dtstart && $end > $dtstart;
+			}
+		}
+		if ($due) {
+			return $start < $due && $end >= $due;
+		}
+		if ($completed && $created) {
+			return
+				($start <= $created || $start <= $completed) &&
+				($end >= $created || $end >= $completed);
+		}
+		if ($completed) {
+			return $start <= $completed && $end >= $completed;
+		}
+		if ($created) {
+			return $end > $created;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules()
-    {
-        return [
-            'UID' => 1,
-            'DTSTAMP' => 1,
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules()
+	{
+		return [
+			'UID' => 1,
+			'DTSTAMP' => 1,
 
-            'CLASS' => '?',
-            'COMPLETED' => '?',
-            'CREATED' => '?',
-            'DESCRIPTION' => '?',
-            'DTSTART' => '?',
-            'GEO' => '?',
-            'LAST-MODIFIED' => '?',
-            'LOCATION' => '?',
-            'ORGANIZER' => '?',
-            'PERCENT' => '?',
-            'PRIORITY' => '?',
-            'RECURRENCE-ID' => '?',
-            'SEQUENCE' => '?',
-            'STATUS' => '?',
-            'SUMMARY' => '?',
-            'URL' => '?',
+			'CLASS' => '?',
+			'COMPLETED' => '?',
+			'CREATED' => '?',
+			'DESCRIPTION' => '?',
+			'DTSTART' => '?',
+			'GEO' => '?',
+			'LAST-MODIFIED' => '?',
+			'LOCATION' => '?',
+			'ORGANIZER' => '?',
+			'PERCENT' => '?',
+			'PRIORITY' => '?',
+			'RECURRENCE-ID' => '?',
+			'SEQUENCE' => '?',
+			'STATUS' => '?',
+			'SUMMARY' => '?',
+			'URL' => '?',
 
-            'RRULE' => '?',
-            'DUE' => '?',
-            'DURATION' => '?',
+			'RRULE' => '?',
+			'DUE' => '?',
+			'DURATION' => '?',
 
-            'ATTACH' => '*',
-            'ATTENDEE' => '*',
-            'CATEGORIES' => '*',
-            'COMMENT' => '*',
-            'CONTACT' => '*',
-            'EXDATE' => '*',
-            'REQUEST-STATUS' => '*',
-            'RELATED-TO' => '*',
-            'RESOURCES' => '*',
-            'RDATE' => '*',
-        ];
-    }
+			'ATTACH' => '*',
+			'ATTENDEE' => '*',
+			'CATEGORIES' => '*',
+			'COMMENT' => '*',
+			'CONTACT' => '*',
+			'EXDATE' => '*',
+			'REQUEST-STATUS' => '*',
+			'RELATED-TO' => '*',
+			'RESOURCES' => '*',
+			'RDATE' => '*',
+		];
+	}
 
-    /**
-     * 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)
-    {
-        $result = parent::validate($options);
-        if (isset($this->DUE) && isset($this->DTSTART)) {
-            $due = $this->DUE;
-            $dtStart = $this->DTSTART;
+	/**
+	 * 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)
+	{
+		$result = parent::validate($options);
+		if (isset($this->DUE) && isset($this->DTSTART)) {
+			$due = $this->DUE;
+			$dtStart = $this->DTSTART;
 
-            if ($due->getValueType() !== $dtStart->getValueType()) {
-                $result[] = [
-                    'level' => 3,
-                    'message' => 'The value type (DATE or DATE-TIME) must be identical for DUE and DTSTART',
-                    'node' => $due,
-                ];
-            } elseif ($due->getDateTime() < $dtStart->getDateTime()) {
-                $result[] = [
-                    'level' => 3,
-                    'message' => 'DUE must occur after DTSTART',
-                    'node' => $due,
-                ];
-            }
-        }
+			if ($due->getValueType() !== $dtStart->getValueType()) {
+				$result[] = [
+					'level' => 3,
+					'message' => 'The value type (DATE or DATE-TIME) must be identical for DUE and DTSTART',
+					'node' => $due,
+				];
+			} elseif ($due->getDateTime() < $dtStart->getDateTime()) {
+				$result[] = [
+					'level' => 3,
+					'message' => 'DUE must occur after DTSTART',
+					'node' => $due,
+				];
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * This method should return a list of default property values.
-     *
-     * @return array
-     */
-    protected function getDefaults()
-    {
-        return [
-            'UID' => 'sabre-vobject-'.VObject\UUIDUtil::getUUID(),
-            'DTSTAMP' => date('Ymd\\THis\\Z'),
-        ];
-    }
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults()
+	{
+		return [
+			'UID' => 'sabre-vobject-'.VObject\UUIDUtil::getUUID(),
+			'DTSTAMP' => date('Ymd\\THis\\Z'),
+		];
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Component/VFreeBusy.php

Indentation +65 added lines, -65 removed lines

@@ -17,77 +17,77 @@
  */
 class VFreeBusy extends VObject\Component
 {
-    /**
-     * Checks based on the contained FREEBUSY information, if a timeslot is
-     * available.
-     *
-     * @return bool
-     */
-    public function isFree(DateTimeInterface $start, DatetimeInterface $end)
-    {
-        foreach ($this->select('FREEBUSY') as $freebusy) {
-            // We are only interested in FBTYPE=BUSY (the default),
-            // FBTYPE=BUSY-TENTATIVE or FBTYPE=BUSY-UNAVAILABLE.
-            if (isset($freebusy['FBTYPE']) && 'BUSY' !== strtoupper(substr((string) $freebusy['FBTYPE'], 0, 4))) {
-                continue;
-            }
+	/**
+	 * Checks based on the contained FREEBUSY information, if a timeslot is
+	 * available.
+	 *
+	 * @return bool
+	 */
+	public function isFree(DateTimeInterface $start, DatetimeInterface $end)
+	{
+		foreach ($this->select('FREEBUSY') as $freebusy) {
+			// We are only interested in FBTYPE=BUSY (the default),
+			// FBTYPE=BUSY-TENTATIVE or FBTYPE=BUSY-UNAVAILABLE.
+			if (isset($freebusy['FBTYPE']) && 'BUSY' !== strtoupper(substr((string) $freebusy['FBTYPE'], 0, 4))) {
+				continue;
+			}
 
-            // The freebusy component can hold more than 1 value, separated by
-            // commas.
-            $periods = explode(',', (string) $freebusy);
+			// The freebusy component can hold more than 1 value, separated by
+			// commas.
+			$periods = explode(',', (string) $freebusy);
 
-            foreach ($periods as $period) {
-                // Every period is formatted as [start]/[end]. The start is an
-                // absolute UTC time, the end may be an absolute UTC time, or
-                // duration (relative) value.
-                list($busyStart, $busyEnd) = explode('/', $period);
+			foreach ($periods as $period) {
+				// Every period is formatted as [start]/[end]. The start is an
+				// absolute UTC time, the end may be an absolute UTC time, or
+				// duration (relative) value.
+				list($busyStart, $busyEnd) = explode('/', $period);
 
-                $busyStart = VObject\DateTimeParser::parse($busyStart);
-                $busyEnd = VObject\DateTimeParser::parse($busyEnd);
-                if ($busyEnd instanceof \DateInterval) {
-                    $busyEnd = $busyStart->add($busyEnd);
-                }
+				$busyStart = VObject\DateTimeParser::parse($busyStart);
+				$busyEnd = VObject\DateTimeParser::parse($busyEnd);
+				if ($busyEnd instanceof \DateInterval) {
+					$busyEnd = $busyStart->add($busyEnd);
+				}
 
-                if ($start < $busyEnd && $end > $busyStart) {
-                    return false;
-                }
-            }
-        }
+				if ($start < $busyEnd && $end > $busyStart) {
+					return false;
+				}
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules()
-    {
-        return [
-            'UID' => 1,
-            'DTSTAMP' => 1,
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules()
+	{
+		return [
+			'UID' => 1,
+			'DTSTAMP' => 1,
 
-            'CONTACT' => '?',
-            'DTSTART' => '?',
-            'DTEND' => '?',
-            'ORGANIZER' => '?',
-            'URL' => '?',
+			'CONTACT' => '?',
+			'DTSTART' => '?',
+			'DTEND' => '?',
+			'ORGANIZER' => '?',
+			'URL' => '?',
 
-            'ATTENDEE' => '*',
-            'COMMENT' => '*',
-            'FREEBUSY' => '*',
-            'REQUEST-STATUS' => '*',
-        ];
-    }
+			'ATTENDEE' => '*',
+			'COMMENT' => '*',
+			'FREEBUSY' => '*',
+			'REQUEST-STATUS' => '*',
+		];
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Component/VEvent.php

Indentation +111 added lines, -111 removed lines

@@ -18,123 +18,123 @@
  */
 class VEvent extends VObject\Component
 {
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
-    {
-        if ($this->RRULE) {
-            try {
-                $it = new EventIterator($this, null, $start->getTimezone());
-            } catch (NoInstancesException $e) {
-                // If we've caught this exception, there are no instances
-                // for the event that fall into the specified time-range.
-                return false;
-            }
+	/**
+	 * Returns true or false depending on if the event falls in the specified
+	 * time-range. This is used for filtering purposes.
+	 *
+	 * The rules used to determine if an event falls within the specified
+	 * time-range is based on the CalDAV specification.
+	 *
+	 * @return bool
+	 */
+	public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
+	{
+		if ($this->RRULE) {
+			try {
+				$it = new EventIterator($this, null, $start->getTimezone());
+			} catch (NoInstancesException $e) {
+				// If we've caught this exception, there are no instances
+				// for the event that fall into the specified time-range.
+				return false;
+			}
 
-            $it->fastForward($start);
+			$it->fastForward($start);
 
-            // We fast-forwarded to a spot where the end-time of the
-            // recurrence instance exceeded the start of the requested
-            // time-range.
-            //
-            // If the starttime of the recurrence did not exceed the
-            // end of the time range as well, we have a match.
-            return $it->getDTStart() < $end && $it->getDTEnd() > $start;
-        }
+			// We fast-forwarded to a spot where the end-time of the
+			// recurrence instance exceeded the start of the requested
+			// time-range.
+			//
+			// If the starttime of the recurrence did not exceed the
+			// end of the time range as well, we have a match.
+			return $it->getDTStart() < $end && $it->getDTEnd() > $start;
+		}
 
-        $effectiveStart = $this->DTSTART->getDateTime($start->getTimezone());
-        if (isset($this->DTEND)) {
-            // The DTEND property is considered non inclusive. So for a 3 day
-            // event in july, dtstart and dtend would have to be July 1st and
-            // July 4th respectively.
-            //
-            // See:
-            // http://tools.ietf.org/html/rfc5545#page-54
-            $effectiveEnd = $this->DTEND->getDateTime($end->getTimezone());
-        } elseif (isset($this->DURATION)) {
-            $effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
-        } elseif (!$this->DTSTART->hasTime()) {
-            $effectiveEnd = $effectiveStart->modify('+1 day');
-        } else {
-            $effectiveEnd = $effectiveStart;
-        }
+		$effectiveStart = $this->DTSTART->getDateTime($start->getTimezone());
+		if (isset($this->DTEND)) {
+			// The DTEND property is considered non inclusive. So for a 3 day
+			// event in july, dtstart and dtend would have to be July 1st and
+			// July 4th respectively.
+			//
+			// See:
+			// http://tools.ietf.org/html/rfc5545#page-54
+			$effectiveEnd = $this->DTEND->getDateTime($end->getTimezone());
+		} elseif (isset($this->DURATION)) {
+			$effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
+		} elseif (!$this->DTSTART->hasTime()) {
+			$effectiveEnd = $effectiveStart->modify('+1 day');
+		} else {
+			$effectiveEnd = $effectiveStart;
+		}
 
-        return
-            ($start < $effectiveEnd) && ($end > $effectiveStart)
-        ;
-    }
+		return
+			($start < $effectiveEnd) && ($end > $effectiveStart)
+		;
+	}
 
-    /**
-     * This method should return a list of default property values.
-     *
-     * @return array
-     */
-    protected function getDefaults()
-    {
-        return [
-            'UID' => 'sabre-vobject-'.VObject\UUIDUtil::getUUID(),
-            'DTSTAMP' => gmdate('Ymd\\THis\\Z'),
-        ];
-    }
+	/**
+	 * This method should return a list of default property values.
+	 *
+	 * @return array
+	 */
+	protected function getDefaults()
+	{
+		return [
+			'UID' => 'sabre-vobject-'.VObject\UUIDUtil::getUUID(),
+			'DTSTAMP' => gmdate('Ymd\\THis\\Z'),
+		];
+	}
 
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules()
-    {
-        $hasMethod = isset($this->parent->METHOD);
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules()
+	{
+		$hasMethod = isset($this->parent->METHOD);
 
-        return [
-            'UID' => 1,
-            'DTSTAMP' => 1,
-            'DTSTART' => $hasMethod ? '?' : '1',
-            'CLASS' => '?',
-            'CREATED' => '?',
-            'DESCRIPTION' => '?',
-            'GEO' => '?',
-            'LAST-MODIFIED' => '?',
-            'LOCATION' => '?',
-            'ORGANIZER' => '?',
-            'PRIORITY' => '?',
-            'SEQUENCE' => '?',
-            'STATUS' => '?',
-            'SUMMARY' => '?',
-            'TRANSP' => '?',
-            'URL' => '?',
-            'RECURRENCE-ID' => '?',
-            'RRULE' => '?',
-            'DTEND' => '?',
-            'DURATION' => '?',
+		return [
+			'UID' => 1,
+			'DTSTAMP' => 1,
+			'DTSTART' => $hasMethod ? '?' : '1',
+			'CLASS' => '?',
+			'CREATED' => '?',
+			'DESCRIPTION' => '?',
+			'GEO' => '?',
+			'LAST-MODIFIED' => '?',
+			'LOCATION' => '?',
+			'ORGANIZER' => '?',
+			'PRIORITY' => '?',
+			'SEQUENCE' => '?',
+			'STATUS' => '?',
+			'SUMMARY' => '?',
+			'TRANSP' => '?',
+			'URL' => '?',
+			'RECURRENCE-ID' => '?',
+			'RRULE' => '?',
+			'DTEND' => '?',
+			'DURATION' => '?',
 
-            'ATTACH' => '*',
-            'ATTENDEE' => '*',
-            'CATEGORIES' => '*',
-            'COMMENT' => '*',
-            'CONTACT' => '*',
-            'EXDATE' => '*',
-            'REQUEST-STATUS' => '*',
-            'RELATED-TO' => '*',
-            'RESOURCES' => '*',
-            'RDATE' => '*',
-        ];
-    }
+			'ATTACH' => '*',
+			'ATTENDEE' => '*',
+			'CATEGORIES' => '*',
+			'COMMENT' => '*',
+			'CONTACT' => '*',
+			'EXDATE' => '*',
+			'REQUEST-STATUS' => '*',
+			'RELATED-TO' => '*',
+			'RESOURCES' => '*',
+			'RDATE' => '*',
+		];
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Component/VTimeZone.php

Indentation +41 added lines, -41 removed lines

@@ -16,48 +16,48 @@
  */
 class VTimeZone extends VObject\Component
 {
-    /**
-     * Returns the PHP DateTimeZone for this VTIMEZONE component.
-     *
-     * If we can't accurately determine the timezone, this method will return
-     * UTC.
-     *
-     * @return \DateTimeZone
-     */
-    public function getTimeZone()
-    {
-        return VObject\TimeZoneUtil::getTimeZone((string) $this->TZID, $this->root);
-    }
+	/**
+	 * Returns the PHP DateTimeZone for this VTIMEZONE component.
+	 *
+	 * If we can't accurately determine the timezone, this method will return
+	 * UTC.
+	 *
+	 * @return \DateTimeZone
+	 */
+	public function getTimeZone()
+	{
+		return VObject\TimeZoneUtil::getTimeZone((string) $this->TZID, $this->root);
+	}
 
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules()
-    {
-        return [
-            'TZID' => 1,
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules()
+	{
+		return [
+			'TZID' => 1,
 
-            'LAST-MODIFIED' => '?',
-            'TZURL' => '?',
+			'LAST-MODIFIED' => '?',
+			'TZURL' => '?',
 
-            // At least 1 STANDARD or DAYLIGHT must appear.
-            //
-            // The validator is not specific yet to pick this up, so these
-            // rules are too loose.
-            'STANDARD' => '*',
-            'DAYLIGHT' => '*',
-        ];
-    }
+			// At least 1 STANDARD or DAYLIGHT must appear.
+			//
+			// The validator is not specific yet to pick this up, so these
+			// rules are too loose.
+			'STANDARD' => '*',
+			'DAYLIGHT' => '*',
+		];
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Component/Available.php

Indentation +95 added lines, -95 removed lines

@@ -16,108 +16,108 @@
  */
 class Available extends VObject\Component
 {
-    /**
-     * Returns the 'effective start' and 'effective end' of this VAVAILABILITY
-     * component.
-     *
-     * We use the DTSTART and DTEND or DURATION to determine this.
-     *
-     * The returned value is an array containing DateTimeImmutable instances.
-     * If either the start or end is 'unbounded' its value will be null
-     * instead.
-     *
-     * @return array
-     */
-    public function getEffectiveStartEnd()
-    {
-        $effectiveStart = $this->DTSTART->getDateTime();
-        if (isset($this->DTEND)) {
-            $effectiveEnd = $this->DTEND->getDateTime();
-        } else {
-            $effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
-        }
+	/**
+	 * Returns the 'effective start' and 'effective end' of this VAVAILABILITY
+	 * component.
+	 *
+	 * We use the DTSTART and DTEND or DURATION to determine this.
+	 *
+	 * The returned value is an array containing DateTimeImmutable instances.
+	 * If either the start or end is 'unbounded' its value will be null
+	 * instead.
+	 *
+	 * @return array
+	 */
+	public function getEffectiveStartEnd()
+	{
+		$effectiveStart = $this->DTSTART->getDateTime();
+		if (isset($this->DTEND)) {
+			$effectiveEnd = $this->DTEND->getDateTime();
+		} else {
+			$effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
+		}
 
-        return [$effectiveStart, $effectiveEnd];
-    }
+		return [$effectiveStart, $effectiveEnd];
+	}
 
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules()
-    {
-        return [
-            'UID' => 1,
-            'DTSTART' => 1,
-            'DTSTAMP' => 1,
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules()
+	{
+		return [
+			'UID' => 1,
+			'DTSTART' => 1,
+			'DTSTAMP' => 1,
 
-            'DTEND' => '?',
-            'DURATION' => '?',
+			'DTEND' => '?',
+			'DURATION' => '?',
 
-            'CREATED' => '?',
-            'DESCRIPTION' => '?',
-            'LAST-MODIFIED' => '?',
-            'RECURRENCE-ID' => '?',
-            'RRULE' => '?',
-            'SUMMARY' => '?',
+			'CREATED' => '?',
+			'DESCRIPTION' => '?',
+			'LAST-MODIFIED' => '?',
+			'RECURRENCE-ID' => '?',
+			'RRULE' => '?',
+			'SUMMARY' => '?',
 
-            'CATEGORIES' => '*',
-            'COMMENT' => '*',
-            'CONTACT' => '*',
-            'EXDATE' => '*',
-            'RDATE' => '*',
+			'CATEGORIES' => '*',
+			'COMMENT' => '*',
+			'CONTACT' => '*',
+			'EXDATE' => '*',
+			'RDATE' => '*',
 
-            'AVAILABLE' => '*',
-        ];
-    }
+			'AVAILABLE' => '*',
+		];
+	}
 
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   Node::REPAIR - May attempt to automatically repair the problem.
-     *   Node::PROFILE_CARDDAV - Validate the vCard for CardDAV purposes.
-     *   Node::PROFILE_CALDAV - Validate the iCalendar for CalDAV purposes.
-     *
-     * 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 - A warning.
-     *   3 - An error.
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0)
-    {
-        $result = parent::validate($options);
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   Node::REPAIR - May attempt to automatically repair the problem.
+	 *   Node::PROFILE_CARDDAV - Validate the vCard for CardDAV purposes.
+	 *   Node::PROFILE_CALDAV - Validate the iCalendar for CalDAV purposes.
+	 *
+	 * 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 - A warning.
+	 *   3 - An error.
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0)
+	{
+		$result = parent::validate($options);
 
-        if (isset($this->DTEND) && isset($this->DURATION)) {
-            $result[] = [
-                'level' => 3,
-                'message' => 'DTEND and DURATION cannot both be present',
-                'node' => $this,
-            ];
-        }
+		if (isset($this->DTEND) && isset($this->DURATION)) {
+			$result[] = [
+				'level' => 3,
+				'message' => 'DTEND and DURATION cannot both be present',
+				'node' => $this,
+			];
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/UUIDUtil.php

Indentation +42 added lines, -42 removed lines

@@ -15,52 +15,52 @@
  */
 class UUIDUtil
 {
-    /**
-     * Returns a pseudo-random v4 UUID.
-     *
-     * This function is based on a comment by Andrew Moore on php.net
-     *
-     * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     *
-     * @return string
-     */
-    public static function getUUID()
-    {
-        return sprintf(
-            '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+	/**
+	 * Returns a pseudo-random v4 UUID.
+	 *
+	 * This function is based on a comment by Andrew Moore on php.net
+	 *
+	 * @see http://www.php.net/manual/en/function.uniqid.php#94959
+	 *
+	 * @return string
+	 */
+	public static function getUUID()
+	{
+		return sprintf(
+			'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
 
-            // 32 bits for "time_low"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+			// 32 bits for "time_low"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff),
 
-            // 16 bits for "time_mid"
-            mt_rand(0, 0xffff),
+			// 16 bits for "time_mid"
+			mt_rand(0, 0xffff),
 
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand(0, 0x0fff) | 0x4000,
+			// 16 bits for "time_hi_and_version",
+			// four most significant bits holds version number 4
+			mt_rand(0, 0x0fff) | 0x4000,
 
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand(0, 0x3fff) | 0x8000,
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			mt_rand(0, 0x3fff) | 0x8000,
 
-            // 48 bits for "node"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
-        );
-    }
+			// 48 bits for "node"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+		);
+	}
 
-    /**
-     * Checks if a string is a valid UUID.
-     *
-     * @param string $uuid
-     *
-     * @return bool
-     */
-    public static function validateUUID($uuid)
-    {
-        return 0 !== preg_match(
-            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
-            $uuid
-        );
-    }
+	/**
+	 * Checks if a string is a valid UUID.
+	 *
+	 * @param string $uuid
+	 *
+	 * @return bool
+	 */
+	public static function validateUUID($uuid)
+	{
+		return 0 !== preg_match(
+			'/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
+			$uuid
+		);
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/VCardConverter.php

Indentation +403 added lines, -403 removed lines

@@ -11,411 +11,411 @@
  */
 class VCardConverter
 {
-    /**
-     * Converts a vCard object to a new version.
-     *
-     * targetVersion must be one of:
-     *   Document::VCARD21
-     *   Document::VCARD30
-     *   Document::VCARD40
-     *
-     * Currently only 3.0 and 4.0 as input and output versions.
-     *
-     * 2.1 has some minor support for the input version, it's incomplete at the
-     * moment though.
-     *
-     * If input and output version are identical, a clone is returned.
-     *
-     * @param int $targetVersion
-     */
-    public function convert(Component\VCard $input, $targetVersion)
-    {
-        $inputVersion = $input->getDocumentType();
-        if ($inputVersion === $targetVersion) {
-            return clone $input;
-        }
-
-        if (!in_array($inputVersion, [Document::VCARD21, Document::VCARD30, Document::VCARD40])) {
-            throw new \InvalidArgumentException('Only vCard 2.1, 3.0 and 4.0 are supported for the input data');
-        }
-        if (!in_array($targetVersion, [Document::VCARD30, Document::VCARD40])) {
-            throw new \InvalidArgumentException('You can only use vCard 3.0 or 4.0 for the target version');
-        }
-
-        $newVersion = Document::VCARD40 === $targetVersion ? '4.0' : '3.0';
-
-        $output = new Component\VCard([
-            'VERSION' => $newVersion,
-        ]);
-
-        // We might have generated a default UID. Remove it!
-        unset($output->UID);
-
-        foreach ($input->children() as $property) {
-            $this->convertProperty($input, $output, $property, $targetVersion);
-        }
-
-        return $output;
-    }
-
-    /**
-     * Handles conversion of a single property.
-     *
-     * @param int $targetVersion
-     */
-    protected function convertProperty(Component\VCard $input, Component\VCard $output, Property $property, $targetVersion)
-    {
-        // Skipping these, those are automatically added.
-        if (in_array($property->name, ['VERSION', 'PRODID'])) {
-            return;
-        }
-
-        $parameters = $property->parameters();
-        $valueType = null;
-        if (isset($parameters['VALUE'])) {
-            $valueType = $parameters['VALUE']->getValue();
-            unset($parameters['VALUE']);
-        }
-        if (!$valueType) {
-            $valueType = $property->getValueType();
-        }
-        if (Document::VCARD30 !== $targetVersion && 'PHONE-NUMBER' === $valueType) {
-            $valueType = null;
-        }
-        $newProperty = $output->createProperty(
-            $property->name,
-            $property->getParts(),
-            [], // parameters will get added a bit later.
-            $valueType
-        );
-
-        if (Document::VCARD30 === $targetVersion) {
-            if ($property instanceof Property\Uri && in_array($property->name, ['PHOTO', 'LOGO', 'SOUND'])) {
-                $newProperty = $this->convertUriToBinary($output, $newProperty);
-            } elseif ($property instanceof Property\VCard\DateAndOrTime) {
-                // In vCard 4, the birth year may be optional. This is not the
-                // case for vCard 3. Apple has a workaround for this that
-                // allows applications that support Apple's extension still
-                // omit birthyears in vCard 3, but applications that do not
-                // support this, will just use a random birthyear. We're
-                // choosing 1604 for the birthyear, because that's what apple
-                // uses.
-                $parts = DateTimeParser::parseVCardDateTime($property->getValue());
-                if (is_null($parts['year'])) {
-                    $newValue = '1604-'.$parts['month'].'-'.$parts['date'];
-                    $newProperty->setValue($newValue);
-                    $newProperty['X-APPLE-OMIT-YEAR'] = '1604';
-                }
-
-                if ('ANNIVERSARY' == $newProperty->name) {
-                    // Microsoft non-standard anniversary
-                    $newProperty->name = 'X-ANNIVERSARY';
-
-                    // We also need to add a new apple property for the same
-                    // purpose. This apple property needs a 'label' in the same
-                    // group, so we first need to find a groupname that doesn't
-                    // exist yet.
-                    $x = 1;
-                    while ($output->select('ITEM'.$x.'.')) {
-                        ++$x;
-                    }
-                    $output->add('ITEM'.$x.'.X-ABDATE', $newProperty->getValue(), ['VALUE' => 'DATE-AND-OR-TIME']);
-                    $output->add('ITEM'.$x.'.X-ABLABEL', '_$!<Anniversary>!$_');
-                }
-            } elseif ('KIND' === $property->name) {
-                switch (strtolower($property->getValue())) {
-                    case 'org':
-                        // vCard 3.0 does not have an equivalent to KIND:ORG,
-                        // but apple has an extension that means the same
-                        // thing.
-                        $newProperty = $output->createProperty('X-ABSHOWAS', 'COMPANY');
-                        break;
-
-                    case 'individual':
-                        // Individual is implicit, so we skip it.
-                        return;
-
-                    case 'group':
-                        // OS X addressbook property
-                        $newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-KIND', 'GROUP');
-                        break;
-                }
-            } elseif ('MEMBER' === $property->name) {
-                $newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-MEMBER', $property->getValue());
-            }
-        } elseif (Document::VCARD40 === $targetVersion) {
-            // These properties were removed in vCard 4.0
-            if (in_array($property->name, ['NAME', 'MAILER', 'LABEL', 'CLASS'])) {
-                return;
-            }
-
-            if ($property instanceof Property\Binary) {
-                $newProperty = $this->convertBinaryToUri($output, $newProperty, $parameters);
-            } elseif ($property instanceof Property\VCard\DateAndOrTime && isset($parameters['X-APPLE-OMIT-YEAR'])) {
-                // If a property such as BDAY contained 'X-APPLE-OMIT-YEAR',
-                // then we're stripping the year from the vcard 4 value.
-                $parts = DateTimeParser::parseVCardDateTime($property->getValue());
-                if ($parts['year'] === $property['X-APPLE-OMIT-YEAR']->getValue()) {
-                    $newValue = '--'.$parts['month'].'-'.$parts['date'];
-                    $newProperty->setValue($newValue);
-                }
-
-                // Regardless if the year matched or not, we do need to strip
-                // X-APPLE-OMIT-YEAR.
-                unset($parameters['X-APPLE-OMIT-YEAR']);
-            }
-            switch ($property->name) {
-                case 'X-ABSHOWAS':
-                    if ('COMPANY' === strtoupper($property->getValue())) {
-                        $newProperty = $output->createProperty('KIND', 'ORG');
-                    }
-                    break;
-                case 'X-ADDRESSBOOKSERVER-KIND':
-                    if ('GROUP' === strtoupper($property->getValue())) {
-                        $newProperty = $output->createProperty('KIND', 'GROUP');
-                    }
-                    break;
-                case 'X-ADDRESSBOOKSERVER-MEMBER':
-                    $newProperty = $output->createProperty('MEMBER', $property->getValue());
-                    break;
-                case 'X-ANNIVERSARY':
-                    $newProperty->name = 'ANNIVERSARY';
-                    // If we already have an anniversary property with the same
-                    // value, ignore.
-                    foreach ($output->select('ANNIVERSARY') as $anniversary) {
-                        if ($anniversary->getValue() === $newProperty->getValue()) {
-                            return;
-                        }
-                    }
-                    break;
-                case 'X-ABDATE':
-                    // Find out what the label was, if it exists.
-                    if (!$property->group) {
-                        break;
-                    }
-                    $label = $input->{$property->group.'.X-ABLABEL'};
-
-                    // We only support converting anniversaries.
-                    if (!$label || '_$!<Anniversary>!$_' !== $label->getValue()) {
-                        break;
-                    }
-
-                    // If we already have an anniversary property with the same
-                    // value, ignore.
-                    foreach ($output->select('ANNIVERSARY') as $anniversary) {
-                        if ($anniversary->getValue() === $newProperty->getValue()) {
-                            return;
-                        }
-                    }
-                    $newProperty->name = 'ANNIVERSARY';
-                    break;
-                // Apple's per-property label system.
-                case 'X-ABLABEL':
-                    if ('_$!<Anniversary>!$_' === $newProperty->getValue()) {
-                        // We can safely remove these, as they are converted to
-                        // ANNIVERSARY properties.
-                        return;
-                    }
-                    break;
-            }
-        }
-
-        // set property group
-        $newProperty->group = $property->group;
-
-        if (Document::VCARD40 === $targetVersion) {
-            $this->convertParameters40($newProperty, $parameters);
-        } else {
-            $this->convertParameters30($newProperty, $parameters);
-        }
-
-        // Lastly, we need to see if there's a need for a VALUE parameter.
-        //
-        // We can do that by instantiating a empty property with that name, and
-        // seeing if the default valueType is identical to the current one.
-        $tempProperty = $output->createProperty($newProperty->name);
-        if ($tempProperty->getValueType() !== $newProperty->getValueType()) {
-            $newProperty['VALUE'] = $newProperty->getValueType();
-        }
-
-        $output->add($newProperty);
-    }
-
-    /**
-     * Converts a BINARY property to a URI property.
-     *
-     * vCard 4.0 no longer supports BINARY properties.
-     *
-     * @param Property\Uri $property the input property
-     * @param $parameters list of parameters that will eventually be added to
-     *                    the new property
-     *
-     * @return Property\Uri
-     */
-    protected function convertBinaryToUri(Component\VCard $output, Property\Binary $newProperty, array &$parameters)
-    {
-        $value = $newProperty->getValue();
-        $newProperty = $output->createProperty(
-            $newProperty->name,
-            null, // no value
-            [], // no parameters yet
-            'URI' // Forcing the BINARY type
-        );
-
-        $mimeType = 'application/octet-stream';
-
-        // See if we can find a better mimetype.
-        if (isset($parameters['TYPE'])) {
-            $newTypes = [];
-            foreach ($parameters['TYPE']->getParts() as $typePart) {
-                if (in_array(
-                    strtoupper($typePart),
-                    ['JPEG', 'PNG', 'GIF']
-                )) {
-                    $mimeType = 'image/'.strtolower($typePart);
-                } else {
-                    $newTypes[] = $typePart;
-                }
-            }
-
-            // If there were any parameters we're not converting to a
-            // mime-type, we need to keep them.
-            if ($newTypes) {
-                $parameters['TYPE']->setParts($newTypes);
-            } else {
-                unset($parameters['TYPE']);
-            }
-        }
-
-        $newProperty->setValue('data:'.$mimeType.';base64,'.base64_encode($value));
-
-        return $newProperty;
-    }
-
-    /**
-     * Converts a URI property to a BINARY property.
-     *
-     * In vCard 4.0 attachments are encoded as data: uri. Even though these may
-     * be valid in vCard 3.0 as well, we should convert those to BINARY if
-     * possible, to improve compatibility.
-     *
-     * @param Property\Uri $property the input property
-     *
-     * @return Property\Binary|null
-     */
-    protected function convertUriToBinary(Component\VCard $output, Property\Uri $newProperty)
-    {
-        $value = $newProperty->getValue();
-
-        // Only converting data: uris
-        if ('data:' !== substr($value, 0, 5)) {
-            return $newProperty;
-        }
-
-        $newProperty = $output->createProperty(
-            $newProperty->name,
-            null, // no value
-            [], // no parameters yet
-            'BINARY'
-        );
-
-        $mimeType = substr($value, 5, strpos($value, ',') - 5);
-        if (strpos($mimeType, ';')) {
-            $mimeType = substr($mimeType, 0, strpos($mimeType, ';'));
-            $newProperty->setValue(base64_decode(substr($value, strpos($value, ',') + 1)));
-        } else {
-            $newProperty->setValue(substr($value, strpos($value, ',') + 1));
-        }
-        unset($value);
-
-        $newProperty['ENCODING'] = 'b';
-        switch ($mimeType) {
-            case 'image/jpeg':
-                $newProperty['TYPE'] = 'JPEG';
-                break;
-            case 'image/png':
-                $newProperty['TYPE'] = 'PNG';
-                break;
-            case 'image/gif':
-                $newProperty['TYPE'] = 'GIF';
-                break;
-        }
-
-        return $newProperty;
-    }
-
-    /**
-     * Adds parameters to a new property for vCard 4.0.
-     */
-    protected function convertParameters40(Property $newProperty, array $parameters)
-    {
-        // Adding all parameters.
-        foreach ($parameters as $param) {
-            // vCard 2.1 allowed parameters with no name
-            if ($param->noName) {
-                $param->noName = false;
-            }
-
-            switch ($param->name) {
-                // We need to see if there's any TYPE=PREF, because in vCard 4
-                // that's now PREF=1.
-                case 'TYPE':
-                    foreach ($param->getParts() as $paramPart) {
-                        if ('PREF' === strtoupper($paramPart)) {
-                            $newProperty->add('PREF', '1');
-                        } else {
-                            $newProperty->add($param->name, $paramPart);
-                        }
-                    }
-                    break;
-                // These no longer exist in vCard 4
-                case 'ENCODING':
-                case 'CHARSET':
-                    break;
-
-                default:
-                    $newProperty->add($param->name, $param->getParts());
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Adds parameters to a new property for vCard 3.0.
-     */
-    protected function convertParameters30(Property $newProperty, array $parameters)
-    {
-        // Adding all parameters.
-        foreach ($parameters as $param) {
-            // vCard 2.1 allowed parameters with no name
-            if ($param->noName) {
-                $param->noName = false;
-            }
-
-            switch ($param->name) {
-                case 'ENCODING':
-                    // This value only existed in vCard 2.1, and should be
-                    // removed for anything else.
-                    if ('QUOTED-PRINTABLE' !== strtoupper($param->getValue())) {
-                        $newProperty->add($param->name, $param->getParts());
-                    }
-                    break;
-
-                /*
+	/**
+	 * Converts a vCard object to a new version.
+	 *
+	 * targetVersion must be one of:
+	 *   Document::VCARD21
+	 *   Document::VCARD30
+	 *   Document::VCARD40
+	 *
+	 * Currently only 3.0 and 4.0 as input and output versions.
+	 *
+	 * 2.1 has some minor support for the input version, it's incomplete at the
+	 * moment though.
+	 *
+	 * If input and output version are identical, a clone is returned.
+	 *
+	 * @param int $targetVersion
+	 */
+	public function convert(Component\VCard $input, $targetVersion)
+	{
+		$inputVersion = $input->getDocumentType();
+		if ($inputVersion === $targetVersion) {
+			return clone $input;
+		}
+
+		if (!in_array($inputVersion, [Document::VCARD21, Document::VCARD30, Document::VCARD40])) {
+			throw new \InvalidArgumentException('Only vCard 2.1, 3.0 and 4.0 are supported for the input data');
+		}
+		if (!in_array($targetVersion, [Document::VCARD30, Document::VCARD40])) {
+			throw new \InvalidArgumentException('You can only use vCard 3.0 or 4.0 for the target version');
+		}
+
+		$newVersion = Document::VCARD40 === $targetVersion ? '4.0' : '3.0';
+
+		$output = new Component\VCard([
+			'VERSION' => $newVersion,
+		]);
+
+		// We might have generated a default UID. Remove it!
+		unset($output->UID);
+
+		foreach ($input->children() as $property) {
+			$this->convertProperty($input, $output, $property, $targetVersion);
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Handles conversion of a single property.
+	 *
+	 * @param int $targetVersion
+	 */
+	protected function convertProperty(Component\VCard $input, Component\VCard $output, Property $property, $targetVersion)
+	{
+		// Skipping these, those are automatically added.
+		if (in_array($property->name, ['VERSION', 'PRODID'])) {
+			return;
+		}
+
+		$parameters = $property->parameters();
+		$valueType = null;
+		if (isset($parameters['VALUE'])) {
+			$valueType = $parameters['VALUE']->getValue();
+			unset($parameters['VALUE']);
+		}
+		if (!$valueType) {
+			$valueType = $property->getValueType();
+		}
+		if (Document::VCARD30 !== $targetVersion && 'PHONE-NUMBER' === $valueType) {
+			$valueType = null;
+		}
+		$newProperty = $output->createProperty(
+			$property->name,
+			$property->getParts(),
+			[], // parameters will get added a bit later.
+			$valueType
+		);
+
+		if (Document::VCARD30 === $targetVersion) {
+			if ($property instanceof Property\Uri && in_array($property->name, ['PHOTO', 'LOGO', 'SOUND'])) {
+				$newProperty = $this->convertUriToBinary($output, $newProperty);
+			} elseif ($property instanceof Property\VCard\DateAndOrTime) {
+				// In vCard 4, the birth year may be optional. This is not the
+				// case for vCard 3. Apple has a workaround for this that
+				// allows applications that support Apple's extension still
+				// omit birthyears in vCard 3, but applications that do not
+				// support this, will just use a random birthyear. We're
+				// choosing 1604 for the birthyear, because that's what apple
+				// uses.
+				$parts = DateTimeParser::parseVCardDateTime($property->getValue());
+				if (is_null($parts['year'])) {
+					$newValue = '1604-'.$parts['month'].'-'.$parts['date'];
+					$newProperty->setValue($newValue);
+					$newProperty['X-APPLE-OMIT-YEAR'] = '1604';
+				}
+
+				if ('ANNIVERSARY' == $newProperty->name) {
+					// Microsoft non-standard anniversary
+					$newProperty->name = 'X-ANNIVERSARY';
+
+					// We also need to add a new apple property for the same
+					// purpose. This apple property needs a 'label' in the same
+					// group, so we first need to find a groupname that doesn't
+					// exist yet.
+					$x = 1;
+					while ($output->select('ITEM'.$x.'.')) {
+						++$x;
+					}
+					$output->add('ITEM'.$x.'.X-ABDATE', $newProperty->getValue(), ['VALUE' => 'DATE-AND-OR-TIME']);
+					$output->add('ITEM'.$x.'.X-ABLABEL', '_$!<Anniversary>!$_');
+				}
+			} elseif ('KIND' === $property->name) {
+				switch (strtolower($property->getValue())) {
+					case 'org':
+						// vCard 3.0 does not have an equivalent to KIND:ORG,
+						// but apple has an extension that means the same
+						// thing.
+						$newProperty = $output->createProperty('X-ABSHOWAS', 'COMPANY');
+						break;
+
+					case 'individual':
+						// Individual is implicit, so we skip it.
+						return;
+
+					case 'group':
+						// OS X addressbook property
+						$newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-KIND', 'GROUP');
+						break;
+				}
+			} elseif ('MEMBER' === $property->name) {
+				$newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-MEMBER', $property->getValue());
+			}
+		} elseif (Document::VCARD40 === $targetVersion) {
+			// These properties were removed in vCard 4.0
+			if (in_array($property->name, ['NAME', 'MAILER', 'LABEL', 'CLASS'])) {
+				return;
+			}
+
+			if ($property instanceof Property\Binary) {
+				$newProperty = $this->convertBinaryToUri($output, $newProperty, $parameters);
+			} elseif ($property instanceof Property\VCard\DateAndOrTime && isset($parameters['X-APPLE-OMIT-YEAR'])) {
+				// If a property such as BDAY contained 'X-APPLE-OMIT-YEAR',
+				// then we're stripping the year from the vcard 4 value.
+				$parts = DateTimeParser::parseVCardDateTime($property->getValue());
+				if ($parts['year'] === $property['X-APPLE-OMIT-YEAR']->getValue()) {
+					$newValue = '--'.$parts['month'].'-'.$parts['date'];
+					$newProperty->setValue($newValue);
+				}
+
+				// Regardless if the year matched or not, we do need to strip
+				// X-APPLE-OMIT-YEAR.
+				unset($parameters['X-APPLE-OMIT-YEAR']);
+			}
+			switch ($property->name) {
+				case 'X-ABSHOWAS':
+					if ('COMPANY' === strtoupper($property->getValue())) {
+						$newProperty = $output->createProperty('KIND', 'ORG');
+					}
+					break;
+				case 'X-ADDRESSBOOKSERVER-KIND':
+					if ('GROUP' === strtoupper($property->getValue())) {
+						$newProperty = $output->createProperty('KIND', 'GROUP');
+					}
+					break;
+				case 'X-ADDRESSBOOKSERVER-MEMBER':
+					$newProperty = $output->createProperty('MEMBER', $property->getValue());
+					break;
+				case 'X-ANNIVERSARY':
+					$newProperty->name = 'ANNIVERSARY';
+					// If we already have an anniversary property with the same
+					// value, ignore.
+					foreach ($output->select('ANNIVERSARY') as $anniversary) {
+						if ($anniversary->getValue() === $newProperty->getValue()) {
+							return;
+						}
+					}
+					break;
+				case 'X-ABDATE':
+					// Find out what the label was, if it exists.
+					if (!$property->group) {
+						break;
+					}
+					$label = $input->{$property->group.'.X-ABLABEL'};
+
+					// We only support converting anniversaries.
+					if (!$label || '_$!<Anniversary>!$_' !== $label->getValue()) {
+						break;
+					}
+
+					// If we already have an anniversary property with the same
+					// value, ignore.
+					foreach ($output->select('ANNIVERSARY') as $anniversary) {
+						if ($anniversary->getValue() === $newProperty->getValue()) {
+							return;
+						}
+					}
+					$newProperty->name = 'ANNIVERSARY';
+					break;
+				// Apple's per-property label system.
+				case 'X-ABLABEL':
+					if ('_$!<Anniversary>!$_' === $newProperty->getValue()) {
+						// We can safely remove these, as they are converted to
+						// ANNIVERSARY properties.
+						return;
+					}
+					break;
+			}
+		}
+
+		// set property group
+		$newProperty->group = $property->group;
+
+		if (Document::VCARD40 === $targetVersion) {
+			$this->convertParameters40($newProperty, $parameters);
+		} else {
+			$this->convertParameters30($newProperty, $parameters);
+		}
+
+		// Lastly, we need to see if there's a need for a VALUE parameter.
+		//
+		// We can do that by instantiating a empty property with that name, and
+		// seeing if the default valueType is identical to the current one.
+		$tempProperty = $output->createProperty($newProperty->name);
+		if ($tempProperty->getValueType() !== $newProperty->getValueType()) {
+			$newProperty['VALUE'] = $newProperty->getValueType();
+		}
+
+		$output->add($newProperty);
+	}
+
+	/**
+	 * Converts a BINARY property to a URI property.
+	 *
+	 * vCard 4.0 no longer supports BINARY properties.
+	 *
+	 * @param Property\Uri $property the input property
+	 * @param $parameters list of parameters that will eventually be added to
+	 *                    the new property
+	 *
+	 * @return Property\Uri
+	 */
+	protected function convertBinaryToUri(Component\VCard $output, Property\Binary $newProperty, array &$parameters)
+	{
+		$value = $newProperty->getValue();
+		$newProperty = $output->createProperty(
+			$newProperty->name,
+			null, // no value
+			[], // no parameters yet
+			'URI' // Forcing the BINARY type
+		);
+
+		$mimeType = 'application/octet-stream';
+
+		// See if we can find a better mimetype.
+		if (isset($parameters['TYPE'])) {
+			$newTypes = [];
+			foreach ($parameters['TYPE']->getParts() as $typePart) {
+				if (in_array(
+					strtoupper($typePart),
+					['JPEG', 'PNG', 'GIF']
+				)) {
+					$mimeType = 'image/'.strtolower($typePart);
+				} else {
+					$newTypes[] = $typePart;
+				}
+			}
+
+			// If there were any parameters we're not converting to a
+			// mime-type, we need to keep them.
+			if ($newTypes) {
+				$parameters['TYPE']->setParts($newTypes);
+			} else {
+				unset($parameters['TYPE']);
+			}
+		}
+
+		$newProperty->setValue('data:'.$mimeType.';base64,'.base64_encode($value));
+
+		return $newProperty;
+	}
+
+	/**
+	 * Converts a URI property to a BINARY property.
+	 *
+	 * In vCard 4.0 attachments are encoded as data: uri. Even though these may
+	 * be valid in vCard 3.0 as well, we should convert those to BINARY if
+	 * possible, to improve compatibility.
+	 *
+	 * @param Property\Uri $property the input property
+	 *
+	 * @return Property\Binary|null
+	 */
+	protected function convertUriToBinary(Component\VCard $output, Property\Uri $newProperty)
+	{
+		$value = $newProperty->getValue();
+
+		// Only converting data: uris
+		if ('data:' !== substr($value, 0, 5)) {
+			return $newProperty;
+		}
+
+		$newProperty = $output->createProperty(
+			$newProperty->name,
+			null, // no value
+			[], // no parameters yet
+			'BINARY'
+		);
+
+		$mimeType = substr($value, 5, strpos($value, ',') - 5);
+		if (strpos($mimeType, ';')) {
+			$mimeType = substr($mimeType, 0, strpos($mimeType, ';'));
+			$newProperty->setValue(base64_decode(substr($value, strpos($value, ',') + 1)));
+		} else {
+			$newProperty->setValue(substr($value, strpos($value, ',') + 1));
+		}
+		unset($value);
+
+		$newProperty['ENCODING'] = 'b';
+		switch ($mimeType) {
+			case 'image/jpeg':
+				$newProperty['TYPE'] = 'JPEG';
+				break;
+			case 'image/png':
+				$newProperty['TYPE'] = 'PNG';
+				break;
+			case 'image/gif':
+				$newProperty['TYPE'] = 'GIF';
+				break;
+		}
+
+		return $newProperty;
+	}
+
+	/**
+	 * Adds parameters to a new property for vCard 4.0.
+	 */
+	protected function convertParameters40(Property $newProperty, array $parameters)
+	{
+		// Adding all parameters.
+		foreach ($parameters as $param) {
+			// vCard 2.1 allowed parameters with no name
+			if ($param->noName) {
+				$param->noName = false;
+			}
+
+			switch ($param->name) {
+				// We need to see if there's any TYPE=PREF, because in vCard 4
+				// that's now PREF=1.
+				case 'TYPE':
+					foreach ($param->getParts() as $paramPart) {
+						if ('PREF' === strtoupper($paramPart)) {
+							$newProperty->add('PREF', '1');
+						} else {
+							$newProperty->add($param->name, $paramPart);
+						}
+					}
+					break;
+				// These no longer exist in vCard 4
+				case 'ENCODING':
+				case 'CHARSET':
+					break;
+
+				default:
+					$newProperty->add($param->name, $param->getParts());
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Adds parameters to a new property for vCard 3.0.
+	 */
+	protected function convertParameters30(Property $newProperty, array $parameters)
+	{
+		// Adding all parameters.
+		foreach ($parameters as $param) {
+			// vCard 2.1 allowed parameters with no name
+			if ($param->noName) {
+				$param->noName = false;
+			}
+
+			switch ($param->name) {
+				case 'ENCODING':
+					// This value only existed in vCard 2.1, and should be
+					// removed for anything else.
+					if ('QUOTED-PRINTABLE' !== strtoupper($param->getValue())) {
+						$newProperty->add($param->name, $param->getParts());
+					}
+					break;
+
+				/*
                  * Converting PREF=1 to TYPE=PREF.
                  *
                  * Any other PREF numbers we'll drop.
                  */
-                case 'PREF':
-                    if ('1' == $param->getValue()) {
-                        $newProperty->add('TYPE', 'PREF');
-                    }
-                    break;
-
-                default:
-                    $newProperty->add($param->name, $param->getParts());
-                    break;
-            }
-        }
-    }
+				case 'PREF':
+					if ('1' == $param->getValue()) {
+						$newProperty->add('TYPE', 'PREF');
+					}
+					break;
+
+				default:
+					$newProperty->add($param->name, $param->getParts());
+					break;
+			}
+		}
+	}
 }

htdocs/includes/sabre/sabre/uri/lib/functions.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
     }
 
     $base = parse($basePath);
-    $pick = function ($part) use ($base, $delta) {
+    $pick = function($part) use ($base, $delta) {
         if ($delta[$part]) {
             return $delta[$part];
         } elseif ($base[$part]) {
@@ -187,7 +187,7 @@ 
     // uriencode them first.
     $uri = preg_replace_callback(
         '/[^[:ascii:]]/u',
-        function ($matches) {
+        function($matches) {
             return rawurlencode($matches[0]);
         },
         $uri
@@ -316,7 +316,7 @@ 
     // uriencode them first.
     $uri = preg_replace_callback(
         '/[^[:ascii:]]/u',
-        function ($matches) {
+        function($matches) {
             return rawurlencode($matches[0]);
         },
         $uri

Indentation +260 added lines, -260 removed lines

@@ -22,80 +22,80 @@ 
  */
 function resolve(string $basePath, string $newPath): string
 {
-    $delta = parse($newPath);
-
-    // If the new path defines a scheme, it's absolute and we can just return
-    // that.
-    if ($delta['scheme']) {
-        return build($delta);
-    }
-
-    $base = parse($basePath);
-    $pick = function ($part) use ($base, $delta) {
-        if ($delta[$part]) {
-            return $delta[$part];
-        } elseif ($base[$part]) {
-            return $base[$part];
-        }
-
-        return null;
-    };
-
-    $newParts = [];
-
-    $newParts['scheme'] = $pick('scheme');
-    $newParts['host'] = $pick('host');
-    $newParts['port'] = $pick('port');
-
-    $path = '';
-    if (is_string($delta['path']) and strlen($delta['path']) > 0) {
-        // If the path starts with a slash
-        if ('/' === $delta['path'][0]) {
-            $path = $delta['path'];
-        } else {
-            // Removing last component from base path.
-            $path = $base['path'];
-            $length = strrpos((string) $path, '/');
-            if (false !== $length) {
-                $path = substr($path, 0, $length);
-            }
-            $path .= '/'.$delta['path'];
-        }
-    } else {
-        $path = $base['path'] ?: '/';
-    }
-    // Removing .. and .
-    $pathParts = explode('/', $path);
-    $newPathParts = [];
-    foreach ($pathParts as $pathPart) {
-        switch ($pathPart) {
-            //case '' :
-            case '.':
-                break;
-            case '..':
-                array_pop($newPathParts);
-                break;
-            default:
-                $newPathParts[] = $pathPart;
-                break;
-        }
-    }
-
-    $path = implode('/', $newPathParts);
-
-    // If the source url ended with a /, we want to preserve that.
-    $newParts['path'] = 0 === strpos($path, '/') ? $path : '/'.$path;
-    if ($delta['query']) {
-        $newParts['query'] = $delta['query'];
-    } elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
-        // Keep the old query if host and path didn't change
-        $newParts['query'] = $base['query'];
-    }
-    if ($delta['fragment']) {
-        $newParts['fragment'] = $delta['fragment'];
-    }
-
-    return build($newParts);
+	$delta = parse($newPath);
+
+	// If the new path defines a scheme, it's absolute and we can just return
+	// that.
+	if ($delta['scheme']) {
+		return build($delta);
+	}
+
+	$base = parse($basePath);
+	$pick = function ($part) use ($base, $delta) {
+		if ($delta[$part]) {
+			return $delta[$part];
+		} elseif ($base[$part]) {
+			return $base[$part];
+		}
+
+		return null;
+	};
+
+	$newParts = [];
+
+	$newParts['scheme'] = $pick('scheme');
+	$newParts['host'] = $pick('host');
+	$newParts['port'] = $pick('port');
+
+	$path = '';
+	if (is_string($delta['path']) and strlen($delta['path']) > 0) {
+		// If the path starts with a slash
+		if ('/' === $delta['path'][0]) {
+			$path = $delta['path'];
+		} else {
+			// Removing last component from base path.
+			$path = $base['path'];
+			$length = strrpos((string) $path, '/');
+			if (false !== $length) {
+				$path = substr($path, 0, $length);
+			}
+			$path .= '/'.$delta['path'];
+		}
+	} else {
+		$path = $base['path'] ?: '/';
+	}
+	// Removing .. and .
+	$pathParts = explode('/', $path);
+	$newPathParts = [];
+	foreach ($pathParts as $pathPart) {
+		switch ($pathPart) {
+			//case '' :
+			case '.':
+				break;
+			case '..':
+				array_pop($newPathParts);
+				break;
+			default:
+				$newPathParts[] = $pathPart;
+				break;
+		}
+	}
+
+	$path = implode('/', $newPathParts);
+
+	// If the source url ended with a /, we want to preserve that.
+	$newParts['path'] = 0 === strpos($path, '/') ? $path : '/'.$path;
+	if ($delta['query']) {
+		$newParts['query'] = $delta['query'];
+	} elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
+		// Keep the old query if host and path didn't change
+		$newParts['query'] = $base['query'];
+	}
+	if ($delta['fragment']) {
+		$newParts['fragment'] = $delta['fragment'];
+	}
+
+	return build($newParts);
 }
 
 /**
@@ -111,57 +111,57 @@ 
  */
 function normalize(string $uri): string
 {
-    $parts = parse($uri);
-
-    if (!empty($parts['path'])) {
-        $pathParts = explode('/', ltrim($parts['path'], '/'));
-        $newPathParts = [];
-        foreach ($pathParts as $pathPart) {
-            switch ($pathPart) {
-                case '.':
-                    // skip
-                    break;
-                case '..':
-                    // One level up in the hierarchy
-                    array_pop($newPathParts);
-                    break;
-                default:
-                    // Ensuring that everything is correctly percent-encoded.
-                    $newPathParts[] = rawurlencode(rawurldecode($pathPart));
-                    break;
-            }
-        }
-        $parts['path'] = '/'.implode('/', $newPathParts);
-    }
-
-    if ($parts['scheme']) {
-        $parts['scheme'] = strtolower($parts['scheme']);
-        $defaultPorts = [
-            'http' => '80',
-            'https' => '443',
-        ];
-
-        if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
-            // Removing default ports.
-            unset($parts['port']);
-        }
-        // A few HTTP specific rules.
-        switch ($parts['scheme']) {
-            case 'http':
-            case 'https':
-                if (empty($parts['path'])) {
-                    // An empty path is equivalent to / in http.
-                    $parts['path'] = '/';
-                }
-                break;
-        }
-    }
-
-    if ($parts['host']) {
-        $parts['host'] = strtolower($parts['host']);
-    }
-
-    return build($parts);
+	$parts = parse($uri);
+
+	if (!empty($parts['path'])) {
+		$pathParts = explode('/', ltrim($parts['path'], '/'));
+		$newPathParts = [];
+		foreach ($pathParts as $pathPart) {
+			switch ($pathPart) {
+				case '.':
+					// skip
+					break;
+				case '..':
+					// One level up in the hierarchy
+					array_pop($newPathParts);
+					break;
+				default:
+					// Ensuring that everything is correctly percent-encoded.
+					$newPathParts[] = rawurlencode(rawurldecode($pathPart));
+					break;
+			}
+		}
+		$parts['path'] = '/'.implode('/', $newPathParts);
+	}
+
+	if ($parts['scheme']) {
+		$parts['scheme'] = strtolower($parts['scheme']);
+		$defaultPorts = [
+			'http' => '80',
+			'https' => '443',
+		];
+
+		if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
+			// Removing default ports.
+			unset($parts['port']);
+		}
+		// A few HTTP specific rules.
+		switch ($parts['scheme']) {
+			case 'http':
+			case 'https':
+				if (empty($parts['path'])) {
+					// An empty path is equivalent to / in http.
+					$parts['path'] = '/';
+				}
+				break;
+		}
+	}
+
+	if ($parts['host']) {
+		$parts['host'] = strtolower($parts['host']);
+	}
+
+	return build($parts);
 }
 
 /**
@@ -180,34 +180,34 @@ 
  */
 function parse(string $uri): array
 {
-    // Normally a URI must be ASCII, however. However, often it's not and
-    // parse_url might corrupt these strings.
-    //
-    // For that reason we take any non-ascii characters from the uri and
-    // uriencode them first.
-    $uri = preg_replace_callback(
-        '/[^[:ascii:]]/u',
-        function ($matches) {
-            return rawurlencode($matches[0]);
-        },
-        $uri
-    );
-
-    $result = parse_url($uri);
-    if (!$result) {
-        $result = _parse_fallback($uri);
-    }
-
-    return
-         $result + [
-            'scheme' => null,
-            'host' => null,
-            'path' => null,
-            'port' => null,
-            'user' => null,
-            'query' => null,
-            'fragment' => null,
-        ];
+	// Normally a URI must be ASCII, however. However, often it's not and
+	// parse_url might corrupt these strings.
+	//
+	// For that reason we take any non-ascii characters from the uri and
+	// uriencode them first.
+	$uri = preg_replace_callback(
+		'/[^[:ascii:]]/u',
+		function ($matches) {
+			return rawurlencode($matches[0]);
+		},
+		$uri
+	);
+
+	$result = parse_url($uri);
+	if (!$result) {
+		$result = _parse_fallback($uri);
+	}
+
+	return
+		 $result + [
+			'scheme' => null,
+			'host' => null,
+			'path' => null,
+			'port' => null,
+			'user' => null,
+			'query' => null,
+			'fragment' => null,
+		];
 }
 
 /**
@@ -218,39 +218,39 @@ 
  */
 function build(array $parts): string
 {
-    $uri = '';
-
-    $authority = '';
-    if (!empty($parts['host'])) {
-        $authority = $parts['host'];
-        if (!empty($parts['user'])) {
-            $authority = $parts['user'].'@'.$authority;
-        }
-        if (!empty($parts['port'])) {
-            $authority = $authority.':'.$parts['port'];
-        }
-    }
-
-    if (!empty($parts['scheme'])) {
-        // If there's a scheme, there's also a host.
-        $uri = $parts['scheme'].':';
-    }
-    if ($authority || (!empty($parts['scheme']) && 'file' === $parts['scheme'])) {
-        // No scheme, but there is a host.
-        $uri .= '//'.$authority;
-    }
-
-    if (!empty($parts['path'])) {
-        $uri .= $parts['path'];
-    }
-    if (!empty($parts['query'])) {
-        $uri .= '?'.$parts['query'];
-    }
-    if (!empty($parts['fragment'])) {
-        $uri .= '#'.$parts['fragment'];
-    }
-
-    return $uri;
+	$uri = '';
+
+	$authority = '';
+	if (!empty($parts['host'])) {
+		$authority = $parts['host'];
+		if (!empty($parts['user'])) {
+			$authority = $parts['user'].'@'.$authority;
+		}
+		if (!empty($parts['port'])) {
+			$authority = $authority.':'.$parts['port'];
+		}
+	}
+
+	if (!empty($parts['scheme'])) {
+		// If there's a scheme, there's also a host.
+		$uri = $parts['scheme'].':';
+	}
+	if ($authority || (!empty($parts['scheme']) && 'file' === $parts['scheme'])) {
+		// No scheme, but there is a host.
+		$uri .= '//'.$authority;
+	}
+
+	if (!empty($parts['path'])) {
+		$uri .= $parts['path'];
+	}
+	if (!empty($parts['query'])) {
+		$uri .= '?'.$parts['query'];
+	}
+	if (!empty($parts['fragment'])) {
+		$uri .= '#'.$parts['fragment'];
+	}
+
+	return $uri;
 }
 
 /**
@@ -272,12 +272,12 @@ 
  */
 function split(string $path): array
 {
-    $matches = [];
-    if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
-        return [$matches[1], $matches[2]];
-    }
+	$matches = [];
+	if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
+		return [$matches[1], $matches[2]];
+	}
 
-    return [null, null];
+	return [null, null];
 }
 
 /**
@@ -296,79 +296,79 @@ 
  */
 function _parse_fallback(string $uri): array
 {
-    // Normally a URI must be ASCII, however. However, often it's not and
-    // parse_url might corrupt these strings.
-    //
-    // For that reason we take any non-ascii characters from the uri and
-    // uriencode them first.
-    $uri = preg_replace_callback(
-        '/[^[:ascii:]]/u',
-        function ($matches) {
-            return rawurlencode($matches[0]);
-        },
-        $uri
-    );
-
-    $result = [
-        'scheme' => null,
-        'host' => null,
-        'port' => null,
-        'user' => null,
-        'path' => null,
-        'fragment' => null,
-        'query' => null,
-    ];
-
-    if (preg_match('% ^([A-Za-z][A-Za-z0-9+-\.]+): %x', $uri, $matches)) {
-        $result['scheme'] = $matches[1];
-        // Take what's left.
-        $uri = substr($uri, strlen($result['scheme']) + 1);
-    }
-
-    // Taking off a fragment part
-    if (false !== strpos($uri, '#')) {
-        list($uri, $result['fragment']) = explode('#', $uri, 2);
-    }
-    // Taking off the query part
-    if (false !== strpos($uri, '?')) {
-        list($uri, $result['query']) = explode('?', $uri, 2);
-    }
-
-    if ('///' === substr($uri, 0, 3)) {
-        // The triple slash uris are a bit unusual, but we have special handling
-        // for them.
-        $result['path'] = substr($uri, 2);
-        $result['host'] = '';
-    } elseif ('//' === substr($uri, 0, 2)) {
-        // Uris that have an authority part.
-        $regex = '%^
+	// Normally a URI must be ASCII, however. However, often it's not and
+	// parse_url might corrupt these strings.
+	//
+	// For that reason we take any non-ascii characters from the uri and
+	// uriencode them first.
+	$uri = preg_replace_callback(
+		'/[^[:ascii:]]/u',
+		function ($matches) {
+			return rawurlencode($matches[0]);
+		},
+		$uri
+	);
+
+	$result = [
+		'scheme' => null,
+		'host' => null,
+		'port' => null,
+		'user' => null,
+		'path' => null,
+		'fragment' => null,
+		'query' => null,
+	];
+
+	if (preg_match('% ^([A-Za-z][A-Za-z0-9+-\.]+): %x', $uri, $matches)) {
+		$result['scheme'] = $matches[1];
+		// Take what's left.
+		$uri = substr($uri, strlen($result['scheme']) + 1);
+	}
+
+	// Taking off a fragment part
+	if (false !== strpos($uri, '#')) {
+		list($uri, $result['fragment']) = explode('#', $uri, 2);
+	}
+	// Taking off the query part
+	if (false !== strpos($uri, '?')) {
+		list($uri, $result['query']) = explode('?', $uri, 2);
+	}
+
+	if ('///' === substr($uri, 0, 3)) {
+		// The triple slash uris are a bit unusual, but we have special handling
+		// for them.
+		$result['path'] = substr($uri, 2);
+		$result['host'] = '';
+	} elseif ('//' === substr($uri, 0, 2)) {
+		// Uris that have an authority part.
+		$regex = '%^
             //
             (?: (?<user> [^:@]+) (: (?<pass> [^@]+)) @)?
             (?<host> ( [^:/]* | \[ [^\]]+ \] ))
             (?: : (?<port> [0-9]+))?
             (?<path> / .*)?
           $%x';
-        if (!preg_match($regex, $uri, $matches)) {
-            throw new InvalidUriException('Invalid, or could not parse URI');
-        }
-        if ($matches['host']) {
-            $result['host'] = $matches['host'];
-        }
-        if (isset($matches['port'])) {
-            $result['port'] = (int) $matches['port'];
-        }
-        if (isset($matches['path'])) {
-            $result['path'] = $matches['path'];
-        }
-        if ($matches['user']) {
-            $result['user'] = $matches['user'];
-        }
-        if ($matches['pass']) {
-            $result['pass'] = $matches['pass'];
-        }
-    } else {
-        $result['path'] = $uri;
-    }
-
-    return $result;
+		if (!preg_match($regex, $uri, $matches)) {
+			throw new InvalidUriException('Invalid, or could not parse URI');
+		}
+		if ($matches['host']) {
+			$result['host'] = $matches['host'];
+		}
+		if (isset($matches['port'])) {
+			$result['port'] = (int) $matches['port'];
+		}
+		if (isset($matches['path'])) {
+			$result['path'] = $matches['path'];
+		}
+		if ($matches['user']) {
+			$result['user'] = $matches['user'];
+		}
+		if ($matches['pass']) {
+			$result['pass'] = $matches['pass'];
+		}
+	} else {
+		$result['path'] = $uri;
+	}
+
+	return $result;
 }