YetiForceCompany / YetiForceCRM

libraries/antlr/DFA.php

Doc Comments +1 added lines

@@ -191,6 +191,7 @@
 	 *  like "\1\2\3\9", convert to short[] {2,9,9,9}.  We do this to avoid
 	 *  static short[] which generates so much init code that the class won't
 	 *  compile. :(
+	 * @param string $encodedString
 	 */
 	public static function unpackEncodedString($encodedString) {
 		$data = array();

Indentation +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
 	protected $eot;
 	protected $eof;
 	protected $min;
-    protected $max;
-    protected $accept;
-    protected $special;
-    protected $transition;
+	protected $max;
+	protected $accept;
+	protected $special;
+	protected $transition;
 
 	protected $decisionNumber;
 

Spacing +42 added lines, -42 removed lines

@@ -60,16 +60,16 @@ 
 	 *  an exception upon error.
 	 */
 	
-	public function predict($input){
-		if ( $this->debug ) {
-			echo ("Enter DFA.predict for decision ".$this->decisionNumber);
+	public function predict($input) {
+		if ($this->debug) {
+			echo ("Enter DFA.predict for decision " . $this->decisionNumber);
 		}
 		$mark = $input->mark(); // remember where decision started in input
 		try {
 			$ret = $this->_predict($input);
 			
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$input->rewind($mark);
 			throw $e;
 		}
@@ -79,20 +79,20 @@ 
 	
 	public function _predict($input) {
 		$s = 0; // we always start at s0
-			while ( true ) {
-				if ( $this->debug ) echo ("DFA ".$this->decisionNumber." state ".$s." LA(1)=".$input->LA(1)."(".$input->LA(1)."), index=".$input->index());
+			while (true) {
+				if ($this->debug) echo ("DFA " . $this->decisionNumber . " state " . $s . " LA(1)=" . $input->LA(1) . "(" . $input->LA(1) . "), index=" . $input->index());
 				$specialState = $this->special[$s];
-				if ( $specialState>=0 ) {
-					if ( $this->debug ) {
-						echo ("DFA ".$this->decisionNumber.
-							" state ".$s." is special state ".$specialState);
+				if ($specialState >= 0) {
+					if ($this->debug) {
+						echo ("DFA " . $this->decisionNumber .
+							" state " . $s . " is special state " . $specialState);
 					}
 					$s = $this->specialStateTransition($specialState, $input);
-					if ( $this->debug ) {
-						echo ("DFA ".$this->decisionNumber.
-							" returns from special state ".$specialState." to ".s);
+					if ($this->debug) {
+						echo ("DFA " . $this->decisionNumber .
+							" returns from special state " . $specialState . " to " . s);
 					}
-					if ( $s==-1 ) {
+					if ($s == -1) {
 						$this->noViableAlt($s, $input);
 						return 0;
 					}
@@ -100,50 +100,50 @@ 
 					continue;
 				}
 				
-				if ( $this->accept[$s] >= 1 ) {
-					if ( $this->debug ) echo ("accept; predict "+$this->accept[$s]+" from state "+$this->s);
+				if ($this->accept[$s] >= 1) {
+					if ($this->debug) echo ("accept; predict "+$this->accept[$s] + " from state "+$this->s);
 					return $this->accept[$s];
 				}
 				// look for a normal char transition
 				$c = $input->LA(1); // -1 == \uFFFF, all tokens fit in 65000 space
-				if ($c>=$this->min[$s] && $c<=$this->max[$s]) {
-					$snext = $this->transition[$s][$c-$this->min[$s]]; // move to next state
-					if ( $snext < 0 ) {
+				if ($c >= $this->min[$s] && $c <= $this->max[$s]) {
+					$snext = $this->transition[$s][$c - $this->min[$s]]; // move to next state
+					if ($snext < 0) {
 						// was in range but not a normal transition
 						// must check EOT, which is like the else clause.
 						// eot[s]>=0 indicates that an EOT edge goes to another
 						// state.
-						if ( $this->eot[$s]>=0 ) {  // EOT Transition to accept state?
-							if ( $this->debug ) echo("EOT transition");
+						if ($this->eot[$s] >= 0) {  // EOT Transition to accept state?
+							if ($this->debug) echo("EOT transition");
 							$s = $this->eot[$s];
 							$input->consume();
 							continue;
 						}
-						$this->noViableAlt($s,$input);
+						$this->noViableAlt($s, $input);
 						return 0;
 					}
 					$s = $snext;
 					$input->consume();
 					continue;
 				}
-				if ( $eot[$s]>=0 ) {  // EOT Transition?
-					if ( $this->debug ) println("EOT transition");
+				if ($eot[$s] >= 0) {  // EOT Transition?
+					if ($this->debug) println("EOT transition");
 					$s = $this->eot[$s];
 					$input->consume();
 					continue;
 				}
-				if ( $c==Token::$EOF && $eof[$s]>=0 ) {  // EOF Transition to accept state?
-					if ( $this->debug ) echo ("accept via EOF; predict "+$this->accept[$eof[$s]]+" from "+$eof[$s]);
+				if ($c == Token::$EOF && $eof[$s] >= 0) {  // EOF Transition to accept state?
+					if ($this->debug) echo ("accept via EOF; predict "+$this->accept[$eof[$s]] + " from "+$eof[$s]);
 					return $this->accept[$eof[$s]];
 				}
 				// not in range and not EOF/EOT, must be invalid symbol
-				if ( $this->debug ) {
-					echo("min[".$s."]=".$this->min[$s]);
-					echo("max[".$s."]=".$this->max[$s]);
-					echo("eot[".$s."]=".$this->eot[$s]);
-					echo("eof[".$s."]=".$this->eof[$s]);
-					for ($p=0; $p<$this->transition[$s]->length; $p++) {
-						echo $this->transition[$s][$p]+" ";
+				if ($this->debug) {
+					echo("min[" . $s . "]=" . $this->min[$s]);
+					echo("max[" . $s . "]=" . $this->max[$s]);
+					echo("eot[" . $s . "]=" . $this->eot[$s]);
+					echo("eof[" . $s . "]=" . $this->eof[$s]);
+					for ($p = 0; $p < $this->transition[$s]->length; $p++) {
+						echo $this->transition[$s][$p] + " ";
 					}
 					echo "\n";
 				}
@@ -153,9 +153,9 @@ 
 
 	}
 
-	public function noViableAlt($s, $input){
-		if ($this->recognizer->state->backtracking>0) {
-			$this->recognizer->state->failed=true;
+	public function noViableAlt($s, $input) {
+		if ($this->recognizer->state->backtracking > 0) {
+			$this->recognizer->state->failed = true;
 			return;
 		}
 		$nvae =
@@ -168,7 +168,7 @@ 
 	}
 
 	/** A hook for debugging interface */
-	protected function error($nvae) { ; }
+	protected function error($nvae) {; }
 
 	public function specialStateTransition($s, $input)
 	{
@@ -187,19 +187,19 @@ 
 	public static function unpackEncodedString($encodedString) {
 		$data = array();
 		$di = 0;
-		for ($i=0,$len=strlen($encodedString); $i<$len; $i+=2) {
+		for ($i = 0, $len = strlen($encodedString); $i < $len; $i += 2) {
 			$n = charAt($encodedString, $i);
-			$v = charAt($encodedString, $i+1);
+			$v = charAt($encodedString, $i + 1);
 			// add v n times to data
-			for ($j=1; $j<=$n; $j++) {
-				if($v==0xff) $v=-1;
+			for ($j = 1; $j <= $n; $j++) {
+				if ($v == 0xff) $v = -1;
 				$data[$di++] = $v;
 			}
 		}
 		return $data;
 	}
 	
-	public function __call($fn, $params){
+	public function __call($fn, $params) {
 		return call_user_func_array(array($this->recognizer, $fn), $params);
 	}
 }

Braces +19 added lines, -8 removed lines

@@ -68,8 +68,7 @@ 
 		try {
 			$ret = $this->_predict($input);
 			
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			$input->rewind($mark);
 			throw $e;
 		}
@@ -80,7 +79,9 @@ 
 	public function _predict($input) {
 		$s = 0; // we always start at s0
 			while ( true ) {
-				if ( $this->debug ) echo ("DFA ".$this->decisionNumber." state ".$s." LA(1)=".$input->LA(1)."(".$input->LA(1)."), index=".$input->index());
+				if ( $this->debug ) {
+					echo ("DFA ".$this->decisionNumber." state ".$s." LA(1)=".$input->LA(1)."(".$input->LA(1)."), index=".$input->index());
+				}
 				$specialState = $this->special[$s];
 				if ( $specialState>=0 ) {
 					if ( $this->debug ) {
@@ -101,7 +102,9 @@ 
 				}
 				
 				if ( $this->accept[$s] >= 1 ) {
-					if ( $this->debug ) echo ("accept; predict "+$this->accept[$s]+" from state "+$this->s);
+					if ( $this->debug ) {
+						echo ("accept; predict "+$this->accept[$s]+" from state "+$this->s);
+					}
 					return $this->accept[$s];
 				}
 				// look for a normal char transition
@@ -114,7 +117,9 @@ 
 						// eot[s]>=0 indicates that an EOT edge goes to another
 						// state.
 						if ( $this->eot[$s]>=0 ) {  // EOT Transition to accept state?
-							if ( $this->debug ) echo("EOT transition");
+							if ( $this->debug ) {
+								echo("EOT transition");
+							}
 							$s = $this->eot[$s];
 							$input->consume();
 							continue;
@@ -127,13 +132,17 @@ 
 					continue;
 				}
 				if ( $eot[$s]>=0 ) {  // EOT Transition?
-					if ( $this->debug ) println("EOT transition");
+					if ( $this->debug ) {
+						println("EOT transition");
+					}
 					$s = $this->eot[$s];
 					$input->consume();
 					continue;
 				}
 				if ( $c==Token::$EOF && $eof[$s]>=0 ) {  // EOF Transition to accept state?
-					if ( $this->debug ) echo ("accept via EOF; predict "+$this->accept[$eof[$s]]+" from "+$eof[$s]);
+					if ( $this->debug ) {
+						echo ("accept via EOF; predict "+$this->accept[$eof[$s]]+" from "+$eof[$s]);
+					}
 					return $this->accept[$eof[$s]];
 				}
 				// not in range and not EOF/EOT, must be invalid symbol
@@ -192,7 +201,9 @@ 
 			$v = charAt($encodedString, $i+1);
 			// add v n times to data
 			for ($j=1; $j<=$n; $j++) {
-				if($v==0xff) $v=-1;
+				if($v==0xff) {
+					$v=-1;
+				}
 				$data[$di++] = $v;
 			}
 		}

libraries/antlr/EarlyExitException.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
 class EarlyExitException extends RecognitionException {
 	public $decisionNumber;
 
+	/**
+	 * @param integer $decisionNumber
+	 */
 	public function __construct($decisionNumber, $input) {
 		parent::__construct($input);
 		$this->decisionNumber = $decisionNumber;

libraries/antlr/IntStream.php

Doc Comments +8 added lines

@@ -31,12 +31,17 @@ 
  *  or token type sequence (such as interpretation).
  */
 interface IntStream {
+
+	/**
+	 * @return void
+	 */
 	public function consume();
 
 	/** Get int at current input pointer + i ahead where i=1 is next int.
 	 *  Negative indexes are allowed.  LA(-1) is previous token (token
 	 *  just matched).  LA(-i) where i is before first token should
 	 *  yield -1, invalid char / EOF.
+	 * @param integer $i
 	 */
 	public function LA($i);
 
@@ -62,6 +67,7 @@ 
 	 *  created after this marker argument, this routine must unroll them
 	 *  like a stack.  Assume the state the stream was in when this marker
 	 *  was created.
+	 * @return void
 	 */
 	public function rewind($marker=null);
 
@@ -72,6 +78,7 @@ 
 	 *  This must throw away resources for all markers back to the marker
 	 *  argument.  So if you're nested 5 levels of mark(), and then release(2)
 	 *  you have to release resources for depths 2..5.
+	 * @return void
 	 */
 	public function release($marker);
 
@@ -94,6 +101,7 @@ 
 	 *  The index is 0..n-1.  A seek to position i means that LA(1) will
 	 *  return the ith symbol.  So, seeking to 0 means LA(1) will return the
 	 *  first element in the stream. 
+	 * @return void
 	 */
 	public function seek($index);
 

Indentation +4 added lines, -4 removed lines

@@ -41,18 +41,18 @@
 	public function LA($i);
 
 	/** Tell the stream to start buffering if it hasn't already.  Return
-     *  current input position, index(), or some other marker so that
+	 *  current input position, index(), or some other marker so that
 	 *  when passed to rewind() you get back to the same spot.
 	 *  rewind(mark()) should not affect the input cursor.  The Lexer
 	 *  track line/col info as well as input index so its markers are
 	 *  not pure input indexes.  Same for tree node streams.
-     */
+	 */
 	public function mark();
 
 	/** Return the current input symbol index 0..n where n indicates the
-     *  last symbol has been read.  The index is the symbol about to be
+	 *  last symbol has been read.  The index is the symbol about to be
 	 *  read not the most recently read symbol.
-     */
+	 */
 	public function index();
 
 	/** Reset the stream so that next call to index would return marker.

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 *  like a stack.  Assume the state the stream was in when this marker
 	 *  was created.
 	 */
-	public function rewind($marker=null);
+	public function rewind($marker = null);
 
 	/** You may want to commit to a backtrack but don't want to force the
 	 *  stream to keep bookkeeping objects around for a marker that is

libraries/antlr/NoViableAltException.php

Doc Comments +3 added lines

@@ -32,6 +32,9 @@
 	public $decisionNumber;
 	public $stateNumber;
 
+	/**
+	 * @param string $grammarDecisionDescription
+	 */
 	public function __construct($grammarDecisionDescription,
 								$decisionNumber,
 								$stateNumber,

Spacing +3 added lines, -3 removed lines

@@ -44,11 +44,11 @@
 	}
 
 	public function __toString() {
-		if ( $this->input instanceof CharStream ) {
-			return "NoViableAltException('".$this->getUnexpectedType()."'@[".$this->grammarDecisionDescription."])";
+		if ($this->input instanceof CharStream) {
+			return "NoViableAltException('" . $this->getUnexpectedType() . "'@[" . $this->grammarDecisionDescription . "])";
 		}
 		else {
-			return "NoViableAltException(".$this->getUnexpectedType()."@[".$this->grammarDecisionDescription."])";
+			return "NoViableAltException(" . $this->getUnexpectedType() . "@[" . $this->grammarDecisionDescription . "])";
 		}
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
 	public function __toString() {
 		if ( $this->input instanceof CharStream ) {
 			return "NoViableAltException('".$this->getUnexpectedType()."'@[".$this->grammarDecisionDescription."])";
-		}
-		else {
+		} else {
 			return "NoViableAltException(".$this->getUnexpectedType()."@[".$this->grammarDecisionDescription."])";
 		}
 	}

libraries/antlr/Set.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
 			$this->store = $this->union($otherSet)->store;
 		}
 		
+		/**
+		 * @param integer $value
+		 */
 		public function remove($value){
 			unset($this->store[$value]);
 		}

Spacing +8 added lines, -8 removed lines

@@ -1,30 +1,30 @@
 <?php
 	//Todo: find a decent set implementation for php
-	class Set{
-		public function __construct($arr){
+	class Set {
+		public function __construct($arr) {
 			$this->store = array();
-			foreach($arr as $el){
+			foreach ($arr as $el) {
 				$this->store[$el] = $el;
 			}
 		}
 		
-		public function add($value){
+		public function add($value) {
 			$this->store[$value] = $value;
 		}
 		
-		public function member($value){
+		public function member($value) {
 			return array_key_exists($value, $this->store);
 		}
 		
-		public function union($otherSet){
+		public function union($otherSet) {
 			return new Set(array_merge($this->store, $otherSet->store));
 		}
 		
-		public function unionInPlace($otherSet){
+		public function unionInPlace($otherSet) {
 			$this->store = $this->union($otherSet)->store;
 		}
 		
-		public function remove($value){
+		public function remove($value) {
 			unset($this->store[$value]);
 		}
 	}

libraries/antlr/TokenStream.php

Doc Comments +1 added lines

@@ -55,6 +55,7 @@
 	 *  If the stream does not buffer all the tokens then it can just
 	 *  return "" or null;  Users should not access $ruleLabel.text in
 	 *  an action of course in that case.
+	 * @return null|string
 	 */
 	public function toStringBetween($start, $stop);
 	

Indentation +2 added lines, -2 removed lines

@@ -29,13 +29,13 @@
 
 /** A stream of tokens accessing tokens from a TokenSource */
 interface TokenStream extends IntStream {
-    /** Get Token at current input pointer + i ahead where i=1 is next Token.
+	/** Get Token at current input pointer + i ahead where i=1 is next Token.
 	 *  i<0 indicates tokens in the past.  So -1 is previous token and -2 is
 	 *  two tokens ago. LT(0) is undefined.  For i>=n, return Token.EOFToken.
 	 *  Return null for LT(0) and any index that results in an absolute address
 	 *  that is negative.
 	 */
-    public function LT($k);
+	public function LT($k);
 
 	/** Get a token at an absolute index i; 0..n-1.  This is really only
 	 *  needed for profiling and debugging and token stream rewriting.

libraries/HTTP_Session/Session.php

Doc Comments +3 added lines, -3 removed lines

@@ -549,7 +549,7 @@ 
 	 * Returns session variable
 	 *
 	 * @param string $name    Name of a variable
-	 * @param mixed  $default Default value of a variable if not set
+	 * @param string  $default Default value of a variable if not set
 	 *
 	 * @static
 	 * @access public
@@ -758,7 +758,7 @@ 
 	 *
 	 * @static
 	 * @access public
-	 * @return bool   The previous value of the property
+	 * @return string   The previous value of the property
 	 */
 	public static function setGcMaxLifetime($gcMaxLifetime = null)
 	{
@@ -781,7 +781,7 @@ 
 	 *
 	 * @static
 	 * @access public
-	 * @return bool   The previous value of the property
+	 * @return string   The previous value of the property
 	 */
 	public static function setGcProbability($gcProbability = null)
 	{

libraries/SabreDAV/CalDAV/Backend/AbstractBackend.php

Doc Comments -1 removed lines

@@ -28,7 +28,6 @@
      *
      * Read the PropPatch documenation for more info and examples.
      *
-     * @param string $path
      * @param \Sabre\DAV\PropPatch $propPatch
      * @return void
      */

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

@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Backend;
 
-use Sabre\VObject;
 use Sabre\CalDAV;
+use Sabre\VObject;
 
 /**
  * Abstract Calendaring backend. Extend this class to create your own backends.

Indentation +206 added lines, -206 removed lines

@@ -16,211 +16,211 @@
  */
 abstract class AbstractBackend implements BackendInterface {
 
-    /**
-     * Updates properties for a calendar.
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documenation for more info and examples.
-     *
-     * @param string $path
-     * @param \Sabre\DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
-
-    }
-
-    /**
-     * Returns a list of calendar objects.
-     *
-     * This method should work identical to getCalendarObject, but instead
-     * return all the calendar objects in the list as an array.
-     *
-     * If the backend supports this, it may allow for some speed-ups.
-     *
-     * @param mixed $calendarId
-     * @param array $uris
-     * @return array
-     */
-    public function getMultipleCalendarObjects($calendarId, array $uris) {
-
-        return array_map(function($uri) use ($calendarId) {
-            return $this->getCalendarObject($calendarId, $uri);
-        }, $uris);
-
-    }
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
-     *
-     * Note that it is extremely likely that getCalendarObject for every path
-     * returned from this method will be called almost immediately after. You
-     * may want to anticipate this to speed up these requests.
-     *
-     * This method provides a default implementation, which parses *all* the
-     * iCalendar objects in the specified calendar.
-     *
-     * This default may well be good enough for personal use, and calendars
-     * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
-     *
-     * The best way to do so is override this method and to optimize
-     * specifically for 'common filters'.
-     *
-     * Requests that are extremely common are:
-     *   * requests for just VEVENTS
-     *   * requests for just VTODO
-     *   * requests with a time-range-filter on either VEVENT or VTODO.
-     *
-     * ..and combinations of these requests. It may not be worth it to try to
-     * handle every possible situation and just rely on the (relatively
-     * easy to use) CalendarQueryValidator to handle the rest.
-     *
-     * Note that especially time-range-filters may be difficult to parse. A
-     * time-range filter specified on a VEVENT must for instance also handle
-     * recurrence rules correctly.
-     * A good example of how to interprete all these filters can also simply
-     * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-     * as possible, so it gives you a good idea on what type of stuff you need
-     * to think of.
-     *
-     * @param mixed $calendarId
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters) {
-
-        $result = [];
-        $objects = $this->getCalendarObjects($calendarId);
-
-        foreach ($objects as $object) {
-
-            if ($this->validateFilterForObject($object, $filters)) {
-                $result[] = $object['uri'];
-            }
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * This method validates if a filter (as passed to calendarQuery) matches
-     * the given object.
-     *
-     * @param array $object
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateFilterForObject(array $object, array $filters) {
-
-        // Unfortunately, setting the 'calendardata' here is optional. If
-        // it was excluded, we actually need another call to get this as
-        // well.
-        if (!isset($object['calendardata'])) {
-            $object = $this->getCalendarObject($object['calendarid'], $object['uri']);
-        }
-
-        $vObject = VObject\Reader::read($object['calendardata']);
-
-        $validator = new CalDAV\CalendarQueryValidator();
-        $result = $validator->validate($vObject, $filters);
-
-        // Destroy circular references so PHP will GC the object.
-        $vObject->destroy();
-
-        return $result;
-
-    }
-
-    /**
-     * Searches through all of a users calendars and calendar objects to find
-     * an object with a specific UID.
-     *
-     * This method should return the path to this object, relative to the
-     * calendar home, so this path usually only contains two parts:
-     *
-     * calendarpath/objectpath.ics
-     *
-     * If the uid is not found, return null.
-     *
-     * This method should only consider * objects that the principal owns, so
-     * any calendars owned by other principals that also appear in this
-     * collection should be ignored.
-     *
-     * @param string $principalUri
-     * @param string $uid
-     * @return string|null
-     */
-    public function getCalendarObjectByUID($principalUri, $uid) {
-
-        // Note: this is a super slow naive implementation of this method. You
-        // are highly recommended to optimize it, if your backend allows it.
-        foreach ($this->getCalendarsForUser($principalUri) as $calendar) {
-
-            // We must ignore calendars owned by other principals.
-            if ($calendar['principaluri'] !== $principalUri) {
-                continue;
-            }
-
-            // Ignore calendars that are shared.
-            if (isset($calendar['{http://sabredav.org/ns}owner-principal']) && $calendar['{http://sabredav.org/ns}owner-principal'] !== $principalUri) {
-                continue;
-            }
-
-            $results = $this->calendarQuery(
-                $calendar['id'],
-                [
-                    'name'         => 'VCALENDAR',
-                    'prop-filters' => [],
-                    'comp-filters' => [
-                        [
-                            'name'           => 'VEVENT',
-                            'is-not-defined' => false,
-                            'time-range'     => null,
-                            'comp-filters'   => [],
-                            'prop-filters'   => [
-                                [
-                                    'name'           => 'UID',
-                                    'is-not-defined' => false,
-                                    'time-range'     => null,
-                                    'text-match'     => [
-                                        'value'            => $uid,
-                                        'negate-condition' => false,
-                                        'collation'        => 'i;octet',
-                                    ],
-                                    'param-filters' => [],
-                                ],
-                            ]
-                        ]
-                    ],
-                ]
-            );
-            if ($results) {
-                // We have a match
-                return $calendar['uri'] . '/' . $results[0];
-            }
-
-        }
-
-    }
+	/**
+	 * Updates properties for a calendar.
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documenation for more info and examples.
+	 *
+	 * @param string $path
+	 * @param \Sabre\DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
+
+	}
+
+	/**
+	 * Returns a list of calendar objects.
+	 *
+	 * This method should work identical to getCalendarObject, but instead
+	 * return all the calendar objects in the list as an array.
+	 *
+	 * If the backend supports this, it may allow for some speed-ups.
+	 *
+	 * @param mixed $calendarId
+	 * @param array $uris
+	 * @return array
+	 */
+	public function getMultipleCalendarObjects($calendarId, array $uris) {
+
+		return array_map(function($uri) use ($calendarId) {
+			return $this->getCalendarObject($calendarId, $uri);
+		}, $uris);
+
+	}
+
+	/**
+	 * Performs a calendar-query on the contents of this calendar.
+	 *
+	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
+	 * calendar-query it is possible for a client to request a specific set of
+	 * object, based on contents of iCalendar properties, date-ranges and
+	 * iCalendar component types (VTODO, VEVENT).
+	 *
+	 * This method should just return a list of (relative) urls that match this
+	 * query.
+	 *
+	 * The list of filters are specified as an array. The exact array is
+	 * documented by \Sabre\CalDAV\CalendarQueryParser.
+	 *
+	 * Note that it is extremely likely that getCalendarObject for every path
+	 * returned from this method will be called almost immediately after. You
+	 * may want to anticipate this to speed up these requests.
+	 *
+	 * This method provides a default implementation, which parses *all* the
+	 * iCalendar objects in the specified calendar.
+	 *
+	 * This default may well be good enough for personal use, and calendars
+	 * that aren't very large. But if you anticipate high usage, big calendars
+	 * or high loads, you are strongly adviced to optimize certain paths.
+	 *
+	 * The best way to do so is override this method and to optimize
+	 * specifically for 'common filters'.
+	 *
+	 * Requests that are extremely common are:
+	 *   * requests for just VEVENTS
+	 *   * requests for just VTODO
+	 *   * requests with a time-range-filter on either VEVENT or VTODO.
+	 *
+	 * ..and combinations of these requests. It may not be worth it to try to
+	 * handle every possible situation and just rely on the (relatively
+	 * easy to use) CalendarQueryValidator to handle the rest.
+	 *
+	 * Note that especially time-range-filters may be difficult to parse. A
+	 * time-range filter specified on a VEVENT must for instance also handle
+	 * recurrence rules correctly.
+	 * A good example of how to interprete all these filters can also simply
+	 * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+	 * as possible, so it gives you a good idea on what type of stuff you need
+	 * to think of.
+	 *
+	 * @param mixed $calendarId
+	 * @param array $filters
+	 * @return array
+	 */
+	public function calendarQuery($calendarId, array $filters) {
+
+		$result = [];
+		$objects = $this->getCalendarObjects($calendarId);
+
+		foreach ($objects as $object) {
+
+			if ($this->validateFilterForObject($object, $filters)) {
+				$result[] = $object['uri'];
+			}
+
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * This method validates if a filter (as passed to calendarQuery) matches
+	 * the given object.
+	 *
+	 * @param array $object
+	 * @param array $filters
+	 * @return bool
+	 */
+	protected function validateFilterForObject(array $object, array $filters) {
+
+		// Unfortunately, setting the 'calendardata' here is optional. If
+		// it was excluded, we actually need another call to get this as
+		// well.
+		if (!isset($object['calendardata'])) {
+			$object = $this->getCalendarObject($object['calendarid'], $object['uri']);
+		}
+
+		$vObject = VObject\Reader::read($object['calendardata']);
+
+		$validator = new CalDAV\CalendarQueryValidator();
+		$result = $validator->validate($vObject, $filters);
+
+		// Destroy circular references so PHP will GC the object.
+		$vObject->destroy();
+
+		return $result;
+
+	}
+
+	/**
+	 * Searches through all of a users calendars and calendar objects to find
+	 * an object with a specific UID.
+	 *
+	 * This method should return the path to this object, relative to the
+	 * calendar home, so this path usually only contains two parts:
+	 *
+	 * calendarpath/objectpath.ics
+	 *
+	 * If the uid is not found, return null.
+	 *
+	 * This method should only consider * objects that the principal owns, so
+	 * any calendars owned by other principals that also appear in this
+	 * collection should be ignored.
+	 *
+	 * @param string $principalUri
+	 * @param string $uid
+	 * @return string|null
+	 */
+	public function getCalendarObjectByUID($principalUri, $uid) {
+
+		// Note: this is a super slow naive implementation of this method. You
+		// are highly recommended to optimize it, if your backend allows it.
+		foreach ($this->getCalendarsForUser($principalUri) as $calendar) {
+
+			// We must ignore calendars owned by other principals.
+			if ($calendar['principaluri'] !== $principalUri) {
+				continue;
+			}
+
+			// Ignore calendars that are shared.
+			if (isset($calendar['{http://sabredav.org/ns}owner-principal']) && $calendar['{http://sabredav.org/ns}owner-principal'] !== $principalUri) {
+				continue;
+			}
+
+			$results = $this->calendarQuery(
+				$calendar['id'],
+				[
+					'name'         => 'VCALENDAR',
+					'prop-filters' => [],
+					'comp-filters' => [
+						[
+							'name'           => 'VEVENT',
+							'is-not-defined' => false,
+							'time-range'     => null,
+							'comp-filters'   => [],
+							'prop-filters'   => [
+								[
+									'name'           => 'UID',
+									'is-not-defined' => false,
+									'time-range'     => null,
+									'text-match'     => [
+										'value'            => $uid,
+										'negate-condition' => false,
+										'collation'        => 'i;octet',
+									],
+									'param-filters' => [],
+								],
+							]
+						]
+					],
+				]
+			);
+			if ($results) {
+				// We have a match
+				return $calendar['uri'] . '/' . $results[0];
+			}
+
+		}
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Backend/PDO.php

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

@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Backend;
 
-use Sabre\VObject;
 use Sabre\CalDAV;
 use Sabre\DAV;
 use Sabre\DAV\Exception\Forbidden;
+use Sabre\VObject;
 
 /**
  * PDO CalDAV backend

Braces +12 added lines, -4 removed lines

@@ -398,7 +398,9 @@ 
         $stmt->execute([$calendarId, $objectUri]);
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        if (!$row) return null;
+        if (!$row) {
+        	return null;
+        }
 
         return [
             'id'            => $row['id'],
@@ -862,7 +864,9 @@ 
         $stmt->execute([ $calendarId ]);
         $currentToken = $stmt->fetchColumn(0);
 
-        if (is_null($currentToken)) return null;
+        if (is_null($currentToken)) {
+        	return null;
+        }
 
         $result = [
             'syncToken' => $currentToken,
@@ -874,7 +878,9 @@ 
         if ($syncToken) {
 
             $query = sprintf('SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && calendarid = ? ORDER BY synctoken', $this->calendarChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+            if ($limit > 0) {
+            	$query .= " LIMIT " . (int)$limit;
+            }
 
             // Fetching all changes
             $stmt = $this->pdo->prepare($query);
@@ -1150,7 +1156,9 @@ 
         $stmt->execute([$principalUri, $objectUri]);
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        if (!$row) return null;
+        if (!$row) {
+        	return null;
+        }
 
         return [
             'uri'          => $row['uri'],

Indentation +1147 added lines, -1147 removed lines

@@ -19,763 +19,763 @@ 
  */
 class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
 
-    /**
-     * We need to specify a max date, because we need to stop *somewhere*
-     *
-     * On 32 bit system the maximum for a signed integer is 2147483647, so
-     * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
-     * in 2038-01-19 to avoid problems when the date is converted
-     * to a unix timestamp.
-     */
-    const MAX_DATE = '2038-01-01';
-
-    /**
-     * pdo
-     *
-     * @var \PDO
-     */
-    protected $pdo;
-
-    /**
-     * The table name that will be used for calendars
-     *
-     * @var string
-     */
-    public $calendarTableName = 'calendars';
-
-    /**
-     * The table name that will be used for calendar objects
-     *
-     * @var string
-     */
-    public $calendarObjectTableName = 'calendarobjects';
-
-    /**
-     * The table name that will be used for tracking changes in calendars.
-     *
-     * @var string
-     */
-    public $calendarChangesTableName = 'calendarchanges';
-
-    /**
-     * The table name that will be used inbox items.
-     *
-     * @var string
-     */
-    public $schedulingObjectTableName = 'schedulingobjects';
-
-    /**
-     * The table name that will be used for calendar subscriptions.
-     *
-     * @var string
-     */
-    public $calendarSubscriptionsTableName = 'calendarsubscriptions';
-
-    /**
-     * List of CalDAV properties, and how they map to database fieldnames
-     * Add your own properties by simply adding on to this array.
-     *
-     * Note that only string-based properties are supported here.
-     *
-     * @var array
-     */
-    public $propertyMap = [
-        '{DAV:}displayname'                                   => 'displayname',
-        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
-        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
-        '{http://apple.com/ns/ical/}calendar-order'           => 'calendarorder',
-        '{http://apple.com/ns/ical/}calendar-color'           => 'calendarcolor',
-    ];
-
-    /**
-     * List of subscription properties, and how they map to database fieldnames.
-     *
-     * @var array
-     */
-    public $subscriptionPropertyMap = [
-        '{DAV:}displayname'                                           => 'displayname',
-        '{http://apple.com/ns/ical/}refreshrate'                      => 'refreshrate',
-        '{http://apple.com/ns/ical/}calendar-order'                   => 'calendarorder',
-        '{http://apple.com/ns/ical/}calendar-color'                   => 'calendarcolor',
-        '{http://calendarserver.org/ns/}subscribed-strip-todos'       => 'striptodos',
-        '{http://calendarserver.org/ns/}subscribed-strip-alarms'      => 'stripalarms',
-        '{http://calendarserver.org/ns/}subscribed-strip-attachments' => 'stripattachments',
-    ];
-
-    /**
-     * Creates the backend
-     *
-     * @param \PDO $pdo
-     */
-    public function __construct(\PDO $pdo) {
-
-        $this->pdo = $pdo;
-
-    }
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri. This is just the 'base uri' or 'filename' of the calendar.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * Many clients also require:
-     * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-     * For this property, you can just return an instance of
-     * Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet.
-     *
-     * If you return {http://sabredav.org/ns}read-only and set the value to 1,
-     * ACL will automatically be put in read-only mode.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri) {
-
-        $fields = array_values($this->propertyMap);
-        $fields[] = 'id';
-        $fields[] = 'uri';
-        $fields[] = 'synctoken';
-        $fields[] = 'components';
-        $fields[] = 'principaluri';
-        $fields[] = 'transparent';
-
-        // Making fields a comma-delimited list
-        $fields = implode(', ', $fields);
+	/**
+	 * We need to specify a max date, because we need to stop *somewhere*
+	 *
+	 * On 32 bit system the maximum for a signed integer is 2147483647, so
+	 * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
+	 * in 2038-01-19 to avoid problems when the date is converted
+	 * to a unix timestamp.
+	 */
+	const MAX_DATE = '2038-01-01';
+
+	/**
+	 * pdo
+	 *
+	 * @var \PDO
+	 */
+	protected $pdo;
+
+	/**
+	 * The table name that will be used for calendars
+	 *
+	 * @var string
+	 */
+	public $calendarTableName = 'calendars';
+
+	/**
+	 * The table name that will be used for calendar objects
+	 *
+	 * @var string
+	 */
+	public $calendarObjectTableName = 'calendarobjects';
+
+	/**
+	 * The table name that will be used for tracking changes in calendars.
+	 *
+	 * @var string
+	 */
+	public $calendarChangesTableName = 'calendarchanges';
+
+	/**
+	 * The table name that will be used inbox items.
+	 *
+	 * @var string
+	 */
+	public $schedulingObjectTableName = 'schedulingobjects';
+
+	/**
+	 * The table name that will be used for calendar subscriptions.
+	 *
+	 * @var string
+	 */
+	public $calendarSubscriptionsTableName = 'calendarsubscriptions';
+
+	/**
+	 * List of CalDAV properties, and how they map to database fieldnames
+	 * Add your own properties by simply adding on to this array.
+	 *
+	 * Note that only string-based properties are supported here.
+	 *
+	 * @var array
+	 */
+	public $propertyMap = [
+		'{DAV:}displayname'                                   => 'displayname',
+		'{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
+		'{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
+		'{http://apple.com/ns/ical/}calendar-order'           => 'calendarorder',
+		'{http://apple.com/ns/ical/}calendar-color'           => 'calendarcolor',
+	];
+
+	/**
+	 * List of subscription properties, and how they map to database fieldnames.
+	 *
+	 * @var array
+	 */
+	public $subscriptionPropertyMap = [
+		'{DAV:}displayname'                                           => 'displayname',
+		'{http://apple.com/ns/ical/}refreshrate'                      => 'refreshrate',
+		'{http://apple.com/ns/ical/}calendar-order'                   => 'calendarorder',
+		'{http://apple.com/ns/ical/}calendar-color'                   => 'calendarcolor',
+		'{http://calendarserver.org/ns/}subscribed-strip-todos'       => 'striptodos',
+		'{http://calendarserver.org/ns/}subscribed-strip-alarms'      => 'stripalarms',
+		'{http://calendarserver.org/ns/}subscribed-strip-attachments' => 'stripattachments',
+	];
+
+	/**
+	 * Creates the backend
+	 *
+	 * @param \PDO $pdo
+	 */
+	public function __construct(\PDO $pdo) {
+
+		$this->pdo = $pdo;
+
+	}
+
+	/**
+	 * Returns a list of calendars for a principal.
+	 *
+	 * Every project is an array with the following keys:
+	 *  * id, a unique id that will be used by other functions to modify the
+	 *    calendar. This can be the same as the uri or a database key.
+	 *  * uri. This is just the 'base uri' or 'filename' of the calendar.
+	 *  * principaluri. The owner of the calendar. Almost always the same as
+	 *    principalUri passed to this method.
+	 *
+	 * Furthermore it can contain webdav properties in clark notation. A very
+	 * common one is '{DAV:}displayname'.
+	 *
+	 * Many clients also require:
+	 * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+	 * For this property, you can just return an instance of
+	 * Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet.
+	 *
+	 * If you return {http://sabredav.org/ns}read-only and set the value to 1,
+	 * ACL will automatically be put in read-only mode.
+	 *
+	 * @param string $principalUri
+	 * @return array
+	 */
+	public function getCalendarsForUser($principalUri) {
+
+		$fields = array_values($this->propertyMap);
+		$fields[] = 'id';
+		$fields[] = 'uri';
+		$fields[] = 'synctoken';
+		$fields[] = 'components';
+		$fields[] = 'principaluri';
+		$fields[] = 'transparent';
+
+		// Making fields a comma-delimited list
+		$fields = implode(', ', $fields);
 				$stmt = $this->pdo->prepare(
 <<<SQL
 		SELECT $fields FROM {$this->calendarTableName}
 		WHERE principaluri = ? ORDER BY calendarorder ASC
 SQL
 		);
-        $stmt->execute([$principalUri]);
-
-        $calendars = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            $components = [];
-            if ($row['components']) {
-                $components = explode(',', $row['components']);
-            }
-
-            $calendar = [
-                'id'                                                                 => $row['id'],
-                'uri'                                                                => $row['uri'],
-                'principaluri'                                                       => $row['principaluri'],
-                '{' . CalDAV\Plugin::NS_CALENDARSERVER . '}getctag'                  => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ? $row['synctoken'] : '0'),
-                '{http://sabredav.org/ns}sync-token'                                 => $row['synctoken'] ? $row['synctoken'] : '0',
-                '{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet($components),
-                '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp'         => new CalDAV\Xml\Property\ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
-            ];
-
-
-            foreach ($this->propertyMap as $xmlName => $dbName) {
-                $calendar[$xmlName] = $row[$dbName];
-            }
-
-            $calendars[] = $calendar;
-
-        }
-
-        return $calendars;
-
-    }
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used
-     * to reference this calendar in other methods, such as updateCalendar.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return string
-     */
-    public function createCalendar($principalUri, $calendarUri, array $properties) {
-
-        $fieldNames = [
-            'principaluri',
-            'uri',
-            'synctoken',
-            'transparent',
-        ];
-        $values = [
-            ':principaluri' => $principalUri,
-            ':uri'          => $calendarUri,
-            ':synctoken'    => 1,
-            ':transparent'  => 0,
-        ];
-
-        // Default value
-        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-        $fieldNames[] = 'components';
-        if (!isset($properties[$sccs])) {
-            $values[':components'] = 'VEVENT,VTODO';
-        } else {
-            if (!($properties[$sccs] instanceof CalDAV\Xml\Property\SupportedCalendarComponentSet)) {
-                throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet');
-            }
-            $values[':components'] = implode(',', $properties[$sccs]->getValue());
-        }
-        $transp = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
-        if (isset($properties[$transp])) {
-            $values[':transparent'] = $properties[$transp]->getValue() === 'transparent';
-        }
-
-        foreach ($this->propertyMap as $xmlName => $dbName) {
-            if (isset($properties[$xmlName])) {
-
-                $values[':' . $dbName] = $properties[$xmlName];
-                $fieldNames[] = $dbName;
-            }
-        }
-
-        $stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
-        $stmt->execute($values);
-
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documenation for more info and examples.
-     *
-     * @param string $calendarId
-     * @param \Sabre\DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
-
-        $supportedProperties = array_keys($this->propertyMap);
-        $supportedProperties[] = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
-
-        $propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
-            $newValues = [];
-            foreach ($mutations as $propertyName => $propertyValue) {
-
-                switch ($propertyName) {
-                    case '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp' :
-                        $fieldName = 'transparent';
-                        $newValues[$fieldName] = $propertyValue->getValue() === 'transparent';
-                        break;
-                    default :
-                        $fieldName = $this->propertyMap[$propertyName];
-                        $newValues[$fieldName] = $propertyValue;
-                        break;
-                }
-
-            }
-            $valuesSql = [];
-            foreach ($newValues as $fieldName => $value) {
-                $valuesSql[] = $fieldName . ' = ?';
-            }
+		$stmt->execute([$principalUri]);
+
+		$calendars = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+			$components = [];
+			if ($row['components']) {
+				$components = explode(',', $row['components']);
+			}
+
+			$calendar = [
+				'id'                                                                 => $row['id'],
+				'uri'                                                                => $row['uri'],
+				'principaluri'                                                       => $row['principaluri'],
+				'{' . CalDAV\Plugin::NS_CALENDARSERVER . '}getctag'                  => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token'                                 => $row['synctoken'] ? $row['synctoken'] : '0',
+				'{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet($components),
+				'{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp'         => new CalDAV\Xml\Property\ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+			];
+
+
+			foreach ($this->propertyMap as $xmlName => $dbName) {
+				$calendar[$xmlName] = $row[$dbName];
+			}
+
+			$calendars[] = $calendar;
+
+		}
+
+		return $calendars;
+
+	}
+
+	/**
+	 * Creates a new calendar for a principal.
+	 *
+	 * If the creation was a success, an id must be returned that can be used
+	 * to reference this calendar in other methods, such as updateCalendar.
+	 *
+	 * @param string $principalUri
+	 * @param string $calendarUri
+	 * @param array $properties
+	 * @return string
+	 */
+	public function createCalendar($principalUri, $calendarUri, array $properties) {
+
+		$fieldNames = [
+			'principaluri',
+			'uri',
+			'synctoken',
+			'transparent',
+		];
+		$values = [
+			':principaluri' => $principalUri,
+			':uri'          => $calendarUri,
+			':synctoken'    => 1,
+			':transparent'  => 0,
+		];
+
+		// Default value
+		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+		$fieldNames[] = 'components';
+		if (!isset($properties[$sccs])) {
+			$values[':components'] = 'VEVENT,VTODO';
+		} else {
+			if (!($properties[$sccs] instanceof CalDAV\Xml\Property\SupportedCalendarComponentSet)) {
+				throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet');
+			}
+			$values[':components'] = implode(',', $properties[$sccs]->getValue());
+		}
+		$transp = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
+		if (isset($properties[$transp])) {
+			$values[':transparent'] = $properties[$transp]->getValue() === 'transparent';
+		}
+
+		foreach ($this->propertyMap as $xmlName => $dbName) {
+			if (isset($properties[$xmlName])) {
+
+				$values[':' . $dbName] = $properties[$xmlName];
+				$fieldNames[] = $dbName;
+			}
+		}
+
+		$stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
+		$stmt->execute($values);
+
+		return $this->pdo->lastInsertId();
+
+	}
+
+	/**
+	 * Updates properties for a calendar.
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documenation for more info and examples.
+	 *
+	 * @param string $calendarId
+	 * @param \Sabre\DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
+
+		$supportedProperties = array_keys($this->propertyMap);
+		$supportedProperties[] = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
+
+		$propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
+			$newValues = [];
+			foreach ($mutations as $propertyName => $propertyValue) {
+
+				switch ($propertyName) {
+					case '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp' :
+						$fieldName = 'transparent';
+						$newValues[$fieldName] = $propertyValue->getValue() === 'transparent';
+						break;
+					default :
+						$fieldName = $this->propertyMap[$propertyName];
+						$newValues[$fieldName] = $propertyValue;
+						break;
+				}
+
+			}
+			$valuesSql = [];
+			foreach ($newValues as $fieldName => $value) {
+				$valuesSql[] = $fieldName . ' = ?';
+			}
 			$query = sprintf('UPDATE %s SET %s WHERE id = ?', $this->calendarTableName, implode(', ', $valuesSql));
-            $stmt = $this->pdo->prepare($query);
-            $newValues['id'] = $calendarId;
-            $stmt->execute(array_values($newValues));
+			$stmt = $this->pdo->prepare($query);
+			$newValues['id'] = $calendarId;
+			$stmt->execute(array_values($newValues));
 
-            $this->addChange($calendarId, "", 2);
+			$this->addChange($calendarId, "", 2);
 
-            return true;
+			return true;
 
-        });
+		});
 
-    }
+	}
 
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param string $calendarId
-     * @return void
-     */
-    public function deleteCalendar($calendarId) {
+	/**
+	 * Delete a calendar and all it's objects
+	 *
+	 * @param string $calendarId
+	 * @return void
+	 */
+	public function deleteCalendar($calendarId) {
 
 		$query = sprintf('DELETE FROM %s WHERE calendarid = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId]);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId]);
 
 		$query = sprintf('DELETE FROM %s WHERE id = ?', $this->calendarTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId]);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId]);
 
-        $query = sprintf('DELETE FROM %s WHERE calendarid = ?', $this->calendarChangesTableName);
+		$query = sprintf('DELETE FROM %s WHERE calendarid = ?', $this->calendarChangesTableName);
 		$stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId]);
-
-    }
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can
-     *     be any arbitrary string, but making sure it ends with '.ics' is a
-     *     good idea. This is only the basename, or filename, not the full
-     *     path.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * size - The size of the calendar objects, in bytes.
-     *   * component - optional, a string containing the type of object, such
-     *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
-     *     the Content-Type header.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param string $calendarId
-     * @return array
-     */
-    public function getCalendarObjects($calendarId) {
+		$stmt->execute([$calendarId]);
+
+	}
+
+	/**
+	 * Returns all calendar objects within a calendar.
+	 *
+	 * Every item contains an array with the following keys:
+	 *   * calendardata - The iCalendar-compatible calendar data
+	 *   * uri - a unique key which will be used to construct the uri. This can
+	 *     be any arbitrary string, but making sure it ends with '.ics' is a
+	 *     good idea. This is only the basename, or filename, not the full
+	 *     path.
+	 *   * lastmodified - a timestamp of the last modification time
+	 *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+	 *   '  "abcdef"')
+	 *   * size - The size of the calendar objects, in bytes.
+	 *   * component - optional, a string containing the type of object, such
+	 *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
+	 *     the Content-Type header.
+	 *
+	 * Note that the etag is optional, but it's highly encouraged to return for
+	 * speed reasons.
+	 *
+	 * The calendardata is also optional. If it's not returned
+	 * 'getCalendarObject' will be called later, which *is* expected to return
+	 * calendardata.
+	 *
+	 * If neither etag or size are specified, the calendardata will be
+	 * used/fetched to determine these numbers. If both are specified the
+	 * amount of times this is needed is reduced by a great degree.
+	 *
+	 * @param string $calendarId
+	 * @return array
+	 */
+	public function getCalendarObjects($calendarId) {
 		
 		$query = sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, componenttype FROM %s WHERE calendarid = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId]);
-
-        $result = [];
-        foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-            $result[] = [
-                'id'           => $row['id'],
-                'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
-                'etag'         => '"' . $row['etag'] . '"',
-                'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
-                'component'    => strtolower($row['componenttype']),
-            ];
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * This method must return null if the object did not exist.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return array|null
-     */
-    public function getCalendarObject($calendarId, $objectUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId]);
+
+		$result = [];
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+			$result[] = [
+				'id'           => $row['id'],
+				'uri'          => $row['uri'],
+				'lastmodified' => $row['lastmodified'],
+				'etag'         => '"' . $row['etag'] . '"',
+				'calendarid'   => $row['calendarid'],
+				'size'         => (int)$row['size'],
+				'component'    => strtolower($row['componenttype']),
+			];
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * Returns information from a single calendar object, based on it's object
+	 * uri.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * The returned array must have the same keys as getCalendarObjects. The
+	 * 'calendardata' object is required here though, while it's not required
+	 * for getCalendarObjects.
+	 *
+	 * This method must return null if the object did not exist.
+	 *
+	 * @param string $calendarId
+	 * @param string $objectUri
+	 * @return array|null
+	 */
+	public function getCalendarObject($calendarId, $objectUri) {
 		
 		$query = sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId, $objectUri]);
-        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-        if (!$row) return null;
-
-        return [
-            'id'            => $row['id'],
-            'uri'           => $row['uri'],
-            'lastmodified'  => $row['lastmodified'],
-            'etag'          => '"' . $row['etag'] . '"',
-            'calendarid'    => $row['calendarid'],
-            'size'          => (int)$row['size'],
-            'calendardata'  => $row['calendardata'],
-            'component'     => strtolower($row['componenttype']),
-         ];
-
-    }
-
-    /**
-     * Returns a list of calendar objects.
-     *
-     * This method should work identical to getCalendarObject, but instead
-     * return all the calendar objects in the list as an array.
-     *
-     * If the backend supports this, it may allow for some speed-ups.
-     *
-     * @param mixed $calendarId
-     * @param array $uris
-     * @return array
-     */
-    public function getMultipleCalendarObjects($calendarId, array $uris) {
-
-        $query =sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri IN (', $this->calendarObjectTableName);
-        // Inserting a whole bunch of question marks
-        $query .= implode(',', array_fill(0, count($uris), '?'));
-        $query .= ')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute(array_merge([$calendarId], $uris));
-
-        $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            $result[] = [
-                'id'           => $row['id'],
-                'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
-                'etag'         => '"' . $row['etag'] . '"',
-                'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
-                'calendardata' => $row['calendardata'],
-                'component'    => strtolower($row['componenttype']),
-            ];
-
-        }
-        return $result;
-
-    }
-
-
-    /**
-     * Creates a new calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return string|null
-     */
-    public function createCalendarObject($calendarId, $objectUri, $calendarData) {
-
-        $extraData = $this->getDenormalizedData($calendarData);
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarObjectTableName . ' (calendarid, uri, calendardata, lastmodified, etag, size, componenttype, firstoccurence, lastoccurence, uid) VALUES (?,?,?,?,?,?,?,?,?,?)');
-        $stmt->execute([
-            $calendarId,
-            $objectUri,
-            $calendarData,
-            time(),
-            $extraData['etag'],
-            $extraData['size'],
-            $extraData['componentType'],
-            $extraData['firstOccurence'],
-            $extraData['lastOccurence'],
-            $extraData['uid'],
-        ]);
-        $this->addChange($calendarId, $objectUri, 1);
-
-        return '"' . $extraData['etag'] . '"';
-
-    }
-
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return string|null
-     */
-    public function updateCalendarObject($calendarId, $objectUri, $calendarData) {
-
-        $extraData = $this->getDenormalizedData($calendarData);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId, $objectUri]);
+		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+		if (!$row) return null;
+
+		return [
+			'id'            => $row['id'],
+			'uri'           => $row['uri'],
+			'lastmodified'  => $row['lastmodified'],
+			'etag'          => '"' . $row['etag'] . '"',
+			'calendarid'    => $row['calendarid'],
+			'size'          => (int)$row['size'],
+			'calendardata'  => $row['calendardata'],
+			'component'     => strtolower($row['componenttype']),
+		 ];
+
+	}
+
+	/**
+	 * Returns a list of calendar objects.
+	 *
+	 * This method should work identical to getCalendarObject, but instead
+	 * return all the calendar objects in the list as an array.
+	 *
+	 * If the backend supports this, it may allow for some speed-ups.
+	 *
+	 * @param mixed $calendarId
+	 * @param array $uris
+	 * @return array
+	 */
+	public function getMultipleCalendarObjects($calendarId, array $uris) {
+
+		$query =sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri IN (', $this->calendarObjectTableName);
+		// Inserting a whole bunch of question marks
+		$query .= implode(',', array_fill(0, count($uris), '?'));
+		$query .= ')';
+
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute(array_merge([$calendarId], $uris));
+
+		$result = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+			$result[] = [
+				'id'           => $row['id'],
+				'uri'          => $row['uri'],
+				'lastmodified' => $row['lastmodified'],
+				'etag'         => '"' . $row['etag'] . '"',
+				'calendarid'   => $row['calendarid'],
+				'size'         => (int)$row['size'],
+				'calendardata' => $row['calendardata'],
+				'component'    => strtolower($row['componenttype']),
+			];
+
+		}
+		return $result;
+
+	}
+
+
+	/**
+	 * Creates a new calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * It is possible return an etag from this function, which will be used in
+	 * the response to this PUT request. Note that the ETag must be surrounded
+	 * by double-quotes.
+	 *
+	 * However, you should only really return this ETag if you don't mangle the
+	 * calendar-data. If the result of a subsequent GET to this object is not
+	 * the exact same as this request body, you should omit the ETag.
+	 *
+	 * @param mixed $calendarId
+	 * @param string $objectUri
+	 * @param string $calendarData
+	 * @return string|null
+	 */
+	public function createCalendarObject($calendarId, $objectUri, $calendarData) {
+
+		$extraData = $this->getDenormalizedData($calendarData);
+
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarObjectTableName . ' (calendarid, uri, calendardata, lastmodified, etag, size, componenttype, firstoccurence, lastoccurence, uid) VALUES (?,?,?,?,?,?,?,?,?,?)');
+		$stmt->execute([
+			$calendarId,
+			$objectUri,
+			$calendarData,
+			time(),
+			$extraData['etag'],
+			$extraData['size'],
+			$extraData['componentType'],
+			$extraData['firstOccurence'],
+			$extraData['lastOccurence'],
+			$extraData['uid'],
+		]);
+		$this->addChange($calendarId, $objectUri, 1);
+
+		return '"' . $extraData['etag'] . '"';
+
+	}
+
+	/**
+	 * Updates an existing calendarobject, based on it's uri.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * It is possible return an etag from this function, which will be used in
+	 * the response to this PUT request. Note that the ETag must be surrounded
+	 * by double-quotes.
+	 *
+	 * However, you should only really return this ETag if you don't mangle the
+	 * calendar-data. If the result of a subsequent GET to this object is not
+	 * the exact same as this request body, you should omit the ETag.
+	 *
+	 * @param mixed $calendarId
+	 * @param string $objectUri
+	 * @param string $calendarData
+	 * @return string|null
+	 */
+	public function updateCalendarObject($calendarId, $objectUri, $calendarData) {
+
+		$extraData = $this->getDenormalizedData($calendarData);
 		$query = sprintf('UPDATE %s SET calendardata = ?, lastmodified = ?, etag = ?, size = ?, componenttype = ?, firstoccurence = ?, lastoccurence = ?, uid = ? WHERE calendarid = ? && uri = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarData, time(), $extraData['etag'], $extraData['size'], $extraData['componentType'], $extraData['firstOccurence'], $extraData['lastOccurence'], $extraData['uid'], $calendarId, $objectUri]);
-
-        $this->addChange($calendarId, $objectUri, 2);
-
-        return '"' . $extraData['etag'] . '"';
-
-    }
-
-    /**
-     * Parses some information from calendar objects, used for optimized
-     * calendar-queries.
-     *
-     * Returns an array with the following keys:
-     *   * etag - An md5 checksum of the object without the quotes.
-     *   * size - Size of the object in bytes
-     *   * componentType - VEVENT, VTODO or VJOURNAL
-     *   * firstOccurence
-     *   * lastOccurence
-     *   * uid - value of the UID property
-     *
-     * @param string $calendarData
-     * @return array
-     */
-    protected function getDenormalizedData($calendarData) {
-
-        $vObject = VObject\Reader::read($calendarData);
-        $componentType = null;
-        $component = null;
-        $firstOccurence = null;
-        $lastOccurence = null;
-        $uid = null;
-        foreach ($vObject->getComponents() as $component) {
-            if ($component->name !== 'VTIMEZONE') {
-                $componentType = $component->name;
-                $uid = (string)$component->UID;
-                break;
-            }
-        }
-        if (!$componentType) {
-            throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
-        }
-        if ($componentType === 'VEVENT') {
-            $firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
-            // Finding the last occurence is a bit harder
-            if (!isset($component->RRULE)) {
-                if (isset($component->DTEND)) {
-                    $lastOccurence = $component->DTEND->getDateTime()->getTimeStamp();
-                } elseif (isset($component->DURATION)) {
-                    $endDate = clone $component->DTSTART->getDateTime();
-                    $endDate = $endDate->add(VObject\DateTimeParser::parse($component->DURATION->getValue()));
-                    $lastOccurence = $endDate->getTimeStamp();
-                } elseif (!$component->DTSTART->hasTime()) {
-                    $endDate = clone $component->DTSTART->getDateTime();
-                    $endDate = $endDate->modify('+1 day');
-                    $lastOccurence = $endDate->getTimeStamp();
-                } else {
-                    $lastOccurence = $firstOccurence;
-                }
-            } else {
-                $it = new VObject\Recur\EventIterator($vObject, (string)$component->UID);
-                $maxDate = new \DateTime(self::MAX_DATE);
-                if ($it->isInfinite()) {
-                    $lastOccurence = $maxDate->getTimeStamp();
-                } else {
-                    $end = $it->getDtEnd();
-                    while ($it->valid() && $end < $maxDate) {
-                        $end = $it->getDtEnd();
-                        $it->next();
-
-                    }
-                    $lastOccurence = $end->getTimeStamp();
-                }
-
-            }
-        }
-
-        // Destroy circular references to PHP will GC the object.
-        $vObject->destroy();
-
-        return [
-            'etag'           => md5($calendarData),
-            'size'           => strlen($calendarData),
-            'componentType'  => $componentType,
-            'firstOccurence' => $firstOccurence,
-            'lastOccurence'  => $lastOccurence,
-            'uid'            => $uid,
-        ];
-
-    }
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteCalendarObject($calendarId, $objectUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarData, time(), $extraData['etag'], $extraData['size'], $extraData['componentType'], $extraData['firstOccurence'], $extraData['lastOccurence'], $extraData['uid'], $calendarId, $objectUri]);
+
+		$this->addChange($calendarId, $objectUri, 2);
+
+		return '"' . $extraData['etag'] . '"';
+
+	}
+
+	/**
+	 * Parses some information from calendar objects, used for optimized
+	 * calendar-queries.
+	 *
+	 * Returns an array with the following keys:
+	 *   * etag - An md5 checksum of the object without the quotes.
+	 *   * size - Size of the object in bytes
+	 *   * componentType - VEVENT, VTODO or VJOURNAL
+	 *   * firstOccurence
+	 *   * lastOccurence
+	 *   * uid - value of the UID property
+	 *
+	 * @param string $calendarData
+	 * @return array
+	 */
+	protected function getDenormalizedData($calendarData) {
+
+		$vObject = VObject\Reader::read($calendarData);
+		$componentType = null;
+		$component = null;
+		$firstOccurence = null;
+		$lastOccurence = null;
+		$uid = null;
+		foreach ($vObject->getComponents() as $component) {
+			if ($component->name !== 'VTIMEZONE') {
+				$componentType = $component->name;
+				$uid = (string)$component->UID;
+				break;
+			}
+		}
+		if (!$componentType) {
+			throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
+		}
+		if ($componentType === 'VEVENT') {
+			$firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
+			// Finding the last occurence is a bit harder
+			if (!isset($component->RRULE)) {
+				if (isset($component->DTEND)) {
+					$lastOccurence = $component->DTEND->getDateTime()->getTimeStamp();
+				} elseif (isset($component->DURATION)) {
+					$endDate = clone $component->DTSTART->getDateTime();
+					$endDate = $endDate->add(VObject\DateTimeParser::parse($component->DURATION->getValue()));
+					$lastOccurence = $endDate->getTimeStamp();
+				} elseif (!$component->DTSTART->hasTime()) {
+					$endDate = clone $component->DTSTART->getDateTime();
+					$endDate = $endDate->modify('+1 day');
+					$lastOccurence = $endDate->getTimeStamp();
+				} else {
+					$lastOccurence = $firstOccurence;
+				}
+			} else {
+				$it = new VObject\Recur\EventIterator($vObject, (string)$component->UID);
+				$maxDate = new \DateTime(self::MAX_DATE);
+				if ($it->isInfinite()) {
+					$lastOccurence = $maxDate->getTimeStamp();
+				} else {
+					$end = $it->getDtEnd();
+					while ($it->valid() && $end < $maxDate) {
+						$end = $it->getDtEnd();
+						$it->next();
+
+					}
+					$lastOccurence = $end->getTimeStamp();
+				}
+
+			}
+		}
+
+		// Destroy circular references to PHP will GC the object.
+		$vObject->destroy();
+
+		return [
+			'etag'           => md5($calendarData),
+			'size'           => strlen($calendarData),
+			'componentType'  => $componentType,
+			'firstOccurence' => $firstOccurence,
+			'lastOccurence'  => $lastOccurence,
+			'uid'            => $uid,
+		];
+
+	}
+
+	/**
+	 * Deletes an existing calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * @param string $calendarId
+	 * @param string $objectUri
+	 * @return void
+	 */
+	public function deleteCalendarObject($calendarId, $objectUri) {
 
 		$query = sprintf('DELETE FROM %s WHERE calendarid = ? && uri = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId, $objectUri]);
-
-        $this->addChange($calendarId, $objectUri, 3);
-
-    }
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
-     *
-     * Note that it is extremely likely that getCalendarObject for every path
-     * returned from this method will be called almost immediately after. You
-     * may want to anticipate this to speed up these requests.
-     *
-     * This method provides a default implementation, which parses *all* the
-     * iCalendar objects in the specified calendar.
-     *
-     * This default may well be good enough for personal use, and calendars
-     * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
-     *
-     * The best way to do so is override this method and to optimize
-     * specifically for 'common filters'.
-     *
-     * Requests that are extremely common are:
-     *   * requests for just VEVENTS
-     *   * requests for just VTODO
-     *   * requests with a time-range-filter on a VEVENT.
-     *
-     * ..and combinations of these requests. It may not be worth it to try to
-     * handle every possible situation and just rely on the (relatively
-     * easy to use) CalendarQueryValidator to handle the rest.
-     *
-     * Note that especially time-range-filters may be difficult to parse. A
-     * time-range filter specified on a VEVENT must for instance also handle
-     * recurrence rules correctly.
-     * A good example of how to interprete all these filters can also simply
-     * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-     * as possible, so it gives you a good idea on what type of stuff you need
-     * to think of.
-     *
-     * This specific implementation (for the PDO) backend optimizes filters on
-     * specific components, and VEVENT time-ranges.
-     *
-     * @param string $calendarId
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters) {
-
-        $componentType = null;
-        $requirePostFilter = true;
-        $timeRange = null;
-
-        // if no filters were specified, we don't need to filter after a query
-        if (!$filters['prop-filters'] && !$filters['comp-filters']) {
-            $requirePostFilter = false;
-        }
-
-        // Figuring out if there's a component filter
-        if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
-            $componentType = $filters['comp-filters'][0]['name'];
-
-            // Checking if we need post-filters
-            if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
-                $requirePostFilter = false;
-            }
-            // There was a time-range filter
-            if ($componentType == 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
-                $timeRange = $filters['comp-filters'][0]['time-range'];
-
-                // If start time OR the end time is not specified, we can do a
-                // 100% accurate mysql query.
-                if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
-                    $requirePostFilter = false;
-                }
-            }
-
-        }
-
-        if ($requirePostFilter) {
-            $query = sprintf("SELECT uri, calendardata FROM %s WHERE calendarid = :calendarid", $this->calendarObjectTableName);
-        } else {
-            $query = sprintf("SELECT uri FROM %s WHERE calendarid = :calendarid", $this->calendarObjectTableName);
-        }
-
-        $values = [
-            'calendarid' => $calendarId,
-        ];
-
-        if ($componentType) {
-            $query .= " && componenttype = :componenttype";
-            $values['componenttype'] = $componentType;
-        }
-
-        if ($timeRange && $timeRange['start']) {
-            $query .= " && lastoccurence > :startdate";
-            $values['startdate'] = $timeRange['start']->getTimeStamp();
-        }
-        if ($timeRange && $timeRange['end']) {
-            $query .= " && firstoccurence < :enddate";
-            $values['enddate'] = $timeRange['end']->getTimeStamp();
-        }
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-        $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            if ($requirePostFilter) {
-                if (!$this->validateFilterForObject($row, $filters)) {
-                    continue;
-                }
-            }
-            $result[] = $row['uri'];
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Searches through all of a users calendars and calendar objects to find
-     * an object with a specific UID.
-     *
-     * This method should return the path to this object, relative to the
-     * calendar home, so this path usually only contains two parts:
-     *
-     * calendarpath/objectpath.ics
-     *
-     * If the uid is not found, return null.
-     *
-     * This method should only consider * objects that the principal owns, so
-     * any calendars owned by other principals that also appear in this
-     * collection should be ignored.
-     *
-     * @param string $principalUri
-     * @param string $uid
-     * @return string|null
-     */
-    public function getCalendarObjectByUID($principalUri, $uid) {
-
-        $query = <<<SQL
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId, $objectUri]);
+
+		$this->addChange($calendarId, $objectUri, 3);
+
+	}
+
+	/**
+	 * Performs a calendar-query on the contents of this calendar.
+	 *
+	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
+	 * calendar-query it is possible for a client to request a specific set of
+	 * object, based on contents of iCalendar properties, date-ranges and
+	 * iCalendar component types (VTODO, VEVENT).
+	 *
+	 * This method should just return a list of (relative) urls that match this
+	 * query.
+	 *
+	 * The list of filters are specified as an array. The exact array is
+	 * documented by \Sabre\CalDAV\CalendarQueryParser.
+	 *
+	 * Note that it is extremely likely that getCalendarObject for every path
+	 * returned from this method will be called almost immediately after. You
+	 * may want to anticipate this to speed up these requests.
+	 *
+	 * This method provides a default implementation, which parses *all* the
+	 * iCalendar objects in the specified calendar.
+	 *
+	 * This default may well be good enough for personal use, and calendars
+	 * that aren't very large. But if you anticipate high usage, big calendars
+	 * or high loads, you are strongly adviced to optimize certain paths.
+	 *
+	 * The best way to do so is override this method and to optimize
+	 * specifically for 'common filters'.
+	 *
+	 * Requests that are extremely common are:
+	 *   * requests for just VEVENTS
+	 *   * requests for just VTODO
+	 *   * requests with a time-range-filter on a VEVENT.
+	 *
+	 * ..and combinations of these requests. It may not be worth it to try to
+	 * handle every possible situation and just rely on the (relatively
+	 * easy to use) CalendarQueryValidator to handle the rest.
+	 *
+	 * Note that especially time-range-filters may be difficult to parse. A
+	 * time-range filter specified on a VEVENT must for instance also handle
+	 * recurrence rules correctly.
+	 * A good example of how to interprete all these filters can also simply
+	 * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+	 * as possible, so it gives you a good idea on what type of stuff you need
+	 * to think of.
+	 *
+	 * This specific implementation (for the PDO) backend optimizes filters on
+	 * specific components, and VEVENT time-ranges.
+	 *
+	 * @param string $calendarId
+	 * @param array $filters
+	 * @return array
+	 */
+	public function calendarQuery($calendarId, array $filters) {
+
+		$componentType = null;
+		$requirePostFilter = true;
+		$timeRange = null;
+
+		// if no filters were specified, we don't need to filter after a query
+		if (!$filters['prop-filters'] && !$filters['comp-filters']) {
+			$requirePostFilter = false;
+		}
+
+		// Figuring out if there's a component filter
+		if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
+			$componentType = $filters['comp-filters'][0]['name'];
+
+			// Checking if we need post-filters
+			if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
+				$requirePostFilter = false;
+			}
+			// There was a time-range filter
+			if ($componentType == 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
+				$timeRange = $filters['comp-filters'][0]['time-range'];
+
+				// If start time OR the end time is not specified, we can do a
+				// 100% accurate mysql query.
+				if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
+					$requirePostFilter = false;
+				}
+			}
+
+		}
+
+		if ($requirePostFilter) {
+			$query = sprintf("SELECT uri, calendardata FROM %s WHERE calendarid = :calendarid", $this->calendarObjectTableName);
+		} else {
+			$query = sprintf("SELECT uri FROM %s WHERE calendarid = :calendarid", $this->calendarObjectTableName);
+		}
+
+		$values = [
+			'calendarid' => $calendarId,
+		];
+
+		if ($componentType) {
+			$query .= " && componenttype = :componenttype";
+			$values['componenttype'] = $componentType;
+		}
+
+		if ($timeRange && $timeRange['start']) {
+			$query .= " && lastoccurence > :startdate";
+			$values['startdate'] = $timeRange['start']->getTimeStamp();
+		}
+		if ($timeRange && $timeRange['end']) {
+			$query .= " && firstoccurence < :enddate";
+			$values['enddate'] = $timeRange['end']->getTimeStamp();
+		}
+
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute($values);
+
+		$result = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			if ($requirePostFilter) {
+				if (!$this->validateFilterForObject($row, $filters)) {
+					continue;
+				}
+			}
+			$result[] = $row['uri'];
+
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * Searches through all of a users calendars and calendar objects to find
+	 * an object with a specific UID.
+	 *
+	 * This method should return the path to this object, relative to the
+	 * calendar home, so this path usually only contains two parts:
+	 *
+	 * calendarpath/objectpath.ics
+	 *
+	 * If the uid is not found, return null.
+	 *
+	 * This method should only consider * objects that the principal owns, so
+	 * any calendars owned by other principals that also appear in this
+	 * collection should be ignored.
+	 *
+	 * @param string $principalUri
+	 * @param string $uid
+	 * @return string|null
+	 */
+	public function getCalendarObjectByUID($principalUri, $uid) {
+
+		$query = <<<SQL
 SELECT
     calendars.uri AS calendaruri, calendarobjects.uri as objecturi
 FROM
@@ -789,439 +789,439 @@ 
     calendarobjects.uid = ?
 SQL;
 
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri, $uid]);
-
-        if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            return $row['calendaruri'] . '/' . $row['objecturi'];
-        }
-
-    }
-
-    /**
-     * The getChanges method returns all the changes that have happened, since
-     * the specified syncToken in the specified calendar.
-     *
-     * This function should return an array, such as the following:
-     *
-     * [
-     *   'syncToken' => 'The current synctoken',
-     *   'added'   => [
-     *      'new.txt',
-     *   ],
-     *   'modified'   => [
-     *      'modified.txt',
-     *   ],
-     *   'deleted' => [
-     *      'foo.php.bak',
-     *      'old.txt'
-     *   ]
-     * ];
-     *
-     * The returned syncToken property should reflect the *current* syncToken
-     * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
-     * property this is needed here too, to ensure the operation is atomic.
-     *
-     * If the $syncToken argument is specified as null, this is an initial
-     * sync, and all members should be reported.
-     *
-     * The modified property is an array of nodenames that have changed since
-     * the last token.
-     *
-     * The deleted property is an array with nodenames, that have been deleted
-     * from collection.
-     *
-     * The $syncLevel argument is basically the 'depth' of the report. If it's
-     * 1, you only have to report changes that happened only directly in
-     * immediate descendants. If it's 2, it should also include changes from
-     * the nodes below the child collections. (grandchildren)
-     *
-     * The $limit argument allows a client to specify how many results should
-     * be returned at most. If the limit is not specified, it should be treated
-     * as infinite.
-     *
-     * If the limit (infinite or not) is higher than you're willing to return,
-     * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
-     *
-     * If the syncToken is expired (due to data cleanup) or unknown, you must
-     * return null.
-     *
-     * The limit is 'suggestive'. You are free to ignore it.
-     *
-     * @param string $calendarId
-     * @param string $syncToken
-     * @param int $syncLevel
-     * @param int $limit
-     * @return array
-     */
-    public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
-
-        // Current synctoken
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri, $uid]);
+
+		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			return $row['calendaruri'] . '/' . $row['objecturi'];
+		}
+
+	}
+
+	/**
+	 * The getChanges method returns all the changes that have happened, since
+	 * the specified syncToken in the specified calendar.
+	 *
+	 * This function should return an array, such as the following:
+	 *
+	 * [
+	 *   'syncToken' => 'The current synctoken',
+	 *   'added'   => [
+	 *      'new.txt',
+	 *   ],
+	 *   'modified'   => [
+	 *      'modified.txt',
+	 *   ],
+	 *   'deleted' => [
+	 *      'foo.php.bak',
+	 *      'old.txt'
+	 *   ]
+	 * ];
+	 *
+	 * The returned syncToken property should reflect the *current* syncToken
+	 * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
+	 * property this is needed here too, to ensure the operation is atomic.
+	 *
+	 * If the $syncToken argument is specified as null, this is an initial
+	 * sync, and all members should be reported.
+	 *
+	 * The modified property is an array of nodenames that have changed since
+	 * the last token.
+	 *
+	 * The deleted property is an array with nodenames, that have been deleted
+	 * from collection.
+	 *
+	 * The $syncLevel argument is basically the 'depth' of the report. If it's
+	 * 1, you only have to report changes that happened only directly in
+	 * immediate descendants. If it's 2, it should also include changes from
+	 * the nodes below the child collections. (grandchildren)
+	 *
+	 * The $limit argument allows a client to specify how many results should
+	 * be returned at most. If the limit is not specified, it should be treated
+	 * as infinite.
+	 *
+	 * If the limit (infinite or not) is higher than you're willing to return,
+	 * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
+	 *
+	 * If the syncToken is expired (due to data cleanup) or unknown, you must
+	 * return null.
+	 *
+	 * The limit is 'suggestive'. You are free to ignore it.
+	 *
+	 * @param string $calendarId
+	 * @param string $syncToken
+	 * @param int $syncLevel
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
+
+		// Current synctoken
 		$query = sprintf('SELECT synctoken FROM %s WHERE id = ?', $this->calendarTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([ $calendarId ]);
-        $currentToken = $stmt->fetchColumn(0);
-
-        if (is_null($currentToken)) return null;
-
-        $result = [
-            'syncToken' => $currentToken,
-            'added'     => [],
-            'modified'  => [],
-            'deleted'   => [],
-        ];
-
-        if ($syncToken) {
-
-            $query = sprintf('SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && calendarid = ? ORDER BY synctoken', $this->calendarChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
-
-            // Fetching all changes
-            $stmt = $this->pdo->prepare($query);
-            $stmt->execute([$syncToken, $currentToken, $calendarId]);
-
-            $changes = [];
-
-            // This loop ensures that any duplicates are overwritten, only the
-            // last change on a node is relevant.
-            while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-                $changes[$row['uri']] = $row['operation'];
-
-            }
-
-            foreach ($changes as $uri => $operation) {
-
-                switch ($operation) {
-                    case 1 :
-                        $result['added'][] = $uri;
-                        break;
-                    case 2 :
-                        $result['modified'][] = $uri;
-                        break;
-                    case 3 :
-                        $result['deleted'][] = $uri;
-                        break;
-                }
-
-            }
-        } else {
-            // No synctoken supplied, this is the initial sync.
-            $query = sprintf('SELECT uri FROM %s WHERE calendarid = ?', $this->calendarObjectTableName);
-            $stmt = $this->pdo->prepare($query);
-            $stmt->execute([$calendarId]);
-
-            $result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
-        }
-        return $result;
-
-    }
-
-    /**
-     * Adds a change record to the calendarchanges table.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @param int $operation 1 = add, 2 = modify, 3 = delete.
-     * @return void
-     */
-    protected function addChange($calendarId, $objectUri, $operation) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarChangesTableName . ' (uri, synctoken, calendarid, operation) SELECT ?, synctoken, ?, ? FROM ' . $this->calendarTableName . ' WHERE id = ?');
-        $stmt->execute([
-            $objectUri,
-            $calendarId,
-            $operation,
-            $calendarId
-        ]);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([ $calendarId ]);
+		$currentToken = $stmt->fetchColumn(0);
+
+		if (is_null($currentToken)) return null;
+
+		$result = [
+			'syncToken' => $currentToken,
+			'added'     => [],
+			'modified'  => [],
+			'deleted'   => [],
+		];
+
+		if ($syncToken) {
+
+			$query = sprintf('SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && calendarid = ? ORDER BY synctoken', $this->calendarChangesTableName);
+			if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+
+			// Fetching all changes
+			$stmt = $this->pdo->prepare($query);
+			$stmt->execute([$syncToken, $currentToken, $calendarId]);
+
+			$changes = [];
+
+			// This loop ensures that any duplicates are overwritten, only the
+			// last change on a node is relevant.
+			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+				$changes[$row['uri']] = $row['operation'];
+
+			}
+
+			foreach ($changes as $uri => $operation) {
+
+				switch ($operation) {
+					case 1 :
+						$result['added'][] = $uri;
+						break;
+					case 2 :
+						$result['modified'][] = $uri;
+						break;
+					case 3 :
+						$result['deleted'][] = $uri;
+						break;
+				}
+
+			}
+		} else {
+			// No synctoken supplied, this is the initial sync.
+			$query = sprintf('SELECT uri FROM %s WHERE calendarid = ?', $this->calendarObjectTableName);
+			$stmt = $this->pdo->prepare($query);
+			$stmt->execute([$calendarId]);
+
+			$result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Adds a change record to the calendarchanges table.
+	 *
+	 * @param mixed $calendarId
+	 * @param string $objectUri
+	 * @param int $operation 1 = add, 2 = modify, 3 = delete.
+	 * @return void
+	 */
+	protected function addChange($calendarId, $objectUri, $operation) {
+
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarChangesTableName . ' (uri, synctoken, calendarid, operation) SELECT ?, synctoken, ?, ? FROM ' . $this->calendarTableName . ' WHERE id = ?');
+		$stmt->execute([
+			$objectUri,
+			$calendarId,
+			$operation,
+			$calendarId
+		]);
 		$query = sprintf('UPDATE %s SET synctoken = synctoken + 1 WHERE id = ?', $this->calendarTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([
-            $calendarId
-        ]);
-
-    }
-
-    /**
-     * Returns a list of subscriptions for a principal.
-     *
-     * Every subscription is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    subscription. This can be the same as the uri or a database key.
-     *  * uri. This is just the 'base uri' or 'filename' of the subscription.
-     *  * principaluri. The owner of the subscription. Almost always the same as
-     *    principalUri passed to this method.
-     *  * source. Url to the actual feed
-     *
-     * Furthermore, all the subscription info must be returned too:
-     *
-     * 1. {DAV:}displayname
-     * 2. {http://apple.com/ns/ical/}refreshrate
-     * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
-     *    should not be stripped).
-     * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
-     *    should not be stripped).
-     * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
-     *    attachments should not be stripped).
-     * 7. {http://apple.com/ns/ical/}calendar-color
-     * 8. {http://apple.com/ns/ical/}calendar-order
-     * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-     *    (should just be an instance of
-     *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
-     *    default components).
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getSubscriptionsForUser($principalUri) {
-
-        $fields = array_values($this->subscriptionPropertyMap);
-        $fields[] = 'id';
-        $fields[] = 'uri';
-        $fields[] = 'source';
-        $fields[] = 'principaluri';
-        $fields[] = 'lastmodified';
-
-        // Making fields a comma-delimited list
-        $fields = implode(', ', $fields);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([
+			$calendarId
+		]);
+
+	}
+
+	/**
+	 * Returns a list of subscriptions for a principal.
+	 *
+	 * Every subscription is an array with the following keys:
+	 *  * id, a unique id that will be used by other functions to modify the
+	 *    subscription. This can be the same as the uri or a database key.
+	 *  * uri. This is just the 'base uri' or 'filename' of the subscription.
+	 *  * principaluri. The owner of the subscription. Almost always the same as
+	 *    principalUri passed to this method.
+	 *  * source. Url to the actual feed
+	 *
+	 * Furthermore, all the subscription info must be returned too:
+	 *
+	 * 1. {DAV:}displayname
+	 * 2. {http://apple.com/ns/ical/}refreshrate
+	 * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
+	 *    should not be stripped).
+	 * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
+	 *    should not be stripped).
+	 * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
+	 *    attachments should not be stripped).
+	 * 7. {http://apple.com/ns/ical/}calendar-color
+	 * 8. {http://apple.com/ns/ical/}calendar-order
+	 * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+	 *    (should just be an instance of
+	 *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
+	 *    default components).
+	 *
+	 * @param string $principalUri
+	 * @return array
+	 */
+	public function getSubscriptionsForUser($principalUri) {
+
+		$fields = array_values($this->subscriptionPropertyMap);
+		$fields[] = 'id';
+		$fields[] = 'uri';
+		$fields[] = 'source';
+		$fields[] = 'principaluri';
+		$fields[] = 'lastmodified';
+
+		// Making fields a comma-delimited list
+		$fields = implode(', ', $fields);
 		$query = sprintf('SELECT %s FROM %s WHERE principaluri = ? ORDER BY calendarorder ASC', $fields, $this->calendarSubscriptionsTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri]);
-
-        $subscriptions = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            $subscription = [
-                'id'           => $row['id'],
-                'uri'          => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                'source'       => $row['source'],
-                'lastmodified' => $row['lastmodified'],
-
-                '{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-            ];
-
-            foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
-                if (!is_null($row[$dbName])) {
-                    $subscription[$xmlName] = $row[$dbName];
-                }
-            }
-
-            $subscriptions[] = $subscription;
-
-        }
-
-        return $subscriptions;
-
-    }
-
-    /**
-     * Creates a new subscription for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this subscription in other methods, such as updateSubscription.
-     *
-     * @param string $principalUri
-     * @param string $uri
-     * @param array $properties
-     * @return mixed
-     */
-    public function createSubscription($principalUri, $uri, array $properties) {
-
-        $fieldNames = [
-            'principaluri',
-            'uri',
-            'source',
-            'lastmodified',
-        ];
-
-        if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
-            throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
-        }
-
-        $values = [
-            ':principaluri' => $principalUri,
-            ':uri'          => $uri,
-            ':source'       => $properties['{http://calendarserver.org/ns/}source']->getHref(),
-            ':lastmodified' => time(),
-        ];
-
-        foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
-            if (isset($properties[$xmlName])) {
-
-                $values[':' . $dbName] = $properties[$xmlName];
-                $fieldNames[] = $dbName;
-            }
-        }
-
-        $stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarSubscriptionsTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
-        $stmt->execute($values);
-
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * Updates a subscription
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documenation for more info and examples.
-     *
-     * @param mixed $subscriptionId
-     * @param \Sabre\DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function updateSubscription($subscriptionId, DAV\PropPatch $propPatch) {
-
-        $supportedProperties = array_keys($this->subscriptionPropertyMap);
-        $supportedProperties[] = '{http://calendarserver.org/ns/}source';
-
-        $propPatch->handle($supportedProperties, function($mutations) use ($subscriptionId) {
-
-            $newValues = [];
-
-            foreach ($mutations as $propertyName => $propertyValue) {
-
-                if ($propertyName === '{http://calendarserver.org/ns/}source') {
-                    $newValues['source'] = $propertyValue->getHref();
-                } else {
-                    $fieldName = $this->subscriptionPropertyMap[$propertyName];
-                    $newValues[$fieldName] = $propertyValue;
-                }
-
-            }
-
-            // Now we're generating the sql query.
-            $valuesSql = [];
-            foreach ($newValues as $fieldName => $value) {
-                $valuesSql[] = $fieldName . ' = ?';
-            }
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri]);
+
+		$subscriptions = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+			$subscription = [
+				'id'           => $row['id'],
+				'uri'          => $row['uri'],
+				'principaluri' => $row['principaluri'],
+				'source'       => $row['source'],
+				'lastmodified' => $row['lastmodified'],
+
+				'{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+			];
+
+			foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
+				if (!is_null($row[$dbName])) {
+					$subscription[$xmlName] = $row[$dbName];
+				}
+			}
+
+			$subscriptions[] = $subscription;
+
+		}
+
+		return $subscriptions;
+
+	}
+
+	/**
+	 * Creates a new subscription for a principal.
+	 *
+	 * If the creation was a success, an id must be returned that can be used to reference
+	 * this subscription in other methods, such as updateSubscription.
+	 *
+	 * @param string $principalUri
+	 * @param string $uri
+	 * @param array $properties
+	 * @return mixed
+	 */
+	public function createSubscription($principalUri, $uri, array $properties) {
+
+		$fieldNames = [
+			'principaluri',
+			'uri',
+			'source',
+			'lastmodified',
+		];
+
+		if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
+			throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
+		}
+
+		$values = [
+			':principaluri' => $principalUri,
+			':uri'          => $uri,
+			':source'       => $properties['{http://calendarserver.org/ns/}source']->getHref(),
+			':lastmodified' => time(),
+		];
+
+		foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
+			if (isset($properties[$xmlName])) {
+
+				$values[':' . $dbName] = $properties[$xmlName];
+				$fieldNames[] = $dbName;
+			}
+		}
+
+		$stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarSubscriptionsTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
+		$stmt->execute($values);
+
+		return $this->pdo->lastInsertId();
+
+	}
+
+	/**
+	 * Updates a subscription
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documenation for more info and examples.
+	 *
+	 * @param mixed $subscriptionId
+	 * @param \Sabre\DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function updateSubscription($subscriptionId, DAV\PropPatch $propPatch) {
+
+		$supportedProperties = array_keys($this->subscriptionPropertyMap);
+		$supportedProperties[] = '{http://calendarserver.org/ns/}source';
+
+		$propPatch->handle($supportedProperties, function($mutations) use ($subscriptionId) {
+
+			$newValues = [];
+
+			foreach ($mutations as $propertyName => $propertyValue) {
+
+				if ($propertyName === '{http://calendarserver.org/ns/}source') {
+					$newValues['source'] = $propertyValue->getHref();
+				} else {
+					$fieldName = $this->subscriptionPropertyMap[$propertyName];
+					$newValues[$fieldName] = $propertyValue;
+				}
+
+			}
+
+			// Now we're generating the sql query.
+			$valuesSql = [];
+			foreach ($newValues as $fieldName => $value) {
+				$valuesSql[] = $fieldName . ' = ?';
+			}
 			$query = sprintf('UPDATE %s SET  %s , lastmodified = ? WHERE id = ?', $this->calendarSubscriptionsTableName, implode(', ', $valuesSql));
-            $stmt = $this->pdo->prepare($query);
-            $newValues['lastmodified'] = time();
-            $newValues['id'] = $subscriptionId;
-            $stmt->execute(array_values($newValues));
+			$stmt = $this->pdo->prepare($query);
+			$newValues['lastmodified'] = time();
+			$newValues['id'] = $subscriptionId;
+			$stmt->execute(array_values($newValues));
 
-            return true;
+			return true;
 
-        });
+		});
 
-    }
+	}
 
-    /**
-     * Deletes a subscription
-     *
-     * @param mixed $subscriptionId
-     * @return void
-     */
-    public function deleteSubscription($subscriptionId) {
+	/**
+	 * Deletes a subscription
+	 *
+	 * @param mixed $subscriptionId
+	 * @return void
+	 */
+	public function deleteSubscription($subscriptionId) {
 		$query = sprintf('DELETE FROM %s WHERE id = ?', $this->calendarSubscriptionsTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$subscriptionId]);
-
-    }
-
-    /**
-     * Returns a single scheduling object.
-     *
-     * The returned array should contain the following elements:
-     *   * uri - A unique basename for the object. This will be used to
-     *           construct a full uri.
-     *   * calendardata - The iCalendar object
-     *   * lastmodified - The last modification date. Can be an int for a unix
-     *                    timestamp, or a PHP DateTime object.
-     *   * etag - A unique token that must change if the object changed.
-     *   * size - The size of the object, in bytes.
-     *
-     * @param string $principalUri
-     * @param string $objectUri
-     * @return array
-     */
-    public function getSchedulingObject($principalUri, $objectUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$subscriptionId]);
+
+	}
+
+	/**
+	 * Returns a single scheduling object.
+	 *
+	 * The returned array should contain the following elements:
+	 *   * uri - A unique basename for the object. This will be used to
+	 *           construct a full uri.
+	 *   * calendardata - The iCalendar object
+	 *   * lastmodified - The last modification date. Can be an int for a unix
+	 *                    timestamp, or a PHP DateTime object.
+	 *   * etag - A unique token that must change if the object changed.
+	 *   * size - The size of the object, in bytes.
+	 *
+	 * @param string $principalUri
+	 * @param string $objectUri
+	 * @return array
+	 */
+	public function getSchedulingObject($principalUri, $objectUri) {
 		
 		$query = sprintf('SELECT uri, calendardata, lastmodified, etag, size FROM %s WHERE principaluri = ? && uri = ?', $this->schedulingObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri, $objectUri]);
-        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-        if (!$row) return null;
-
-        return [
-            'uri'          => $row['uri'],
-            'calendardata' => $row['calendardata'],
-            'lastmodified' => $row['lastmodified'],
-            'etag'         => '"' . $row['etag'] . '"',
-            'size'         => (int)$row['size'],
-         ];
-
-    }
-
-    /**
-     * Returns all scheduling objects for the inbox collection.
-     *
-     * These objects should be returned as an array. Every item in the array
-     * should follow the same structure as returned from getSchedulingObject.
-     *
-     * The main difference is that 'calendardata' is optional.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getSchedulingObjects($principalUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri, $objectUri]);
+		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+		if (!$row) return null;
+
+		return [
+			'uri'          => $row['uri'],
+			'calendardata' => $row['calendardata'],
+			'lastmodified' => $row['lastmodified'],
+			'etag'         => '"' . $row['etag'] . '"',
+			'size'         => (int)$row['size'],
+		 ];
+
+	}
+
+	/**
+	 * Returns all scheduling objects for the inbox collection.
+	 *
+	 * These objects should be returned as an array. Every item in the array
+	 * should follow the same structure as returned from getSchedulingObject.
+	 *
+	 * The main difference is that 'calendardata' is optional.
+	 *
+	 * @param string $principalUri
+	 * @return array
+	 */
+	public function getSchedulingObjects($principalUri) {
 
 		$query = sprintf('SELECT id, calendardata, uri, lastmodified, etag, size FROM %s WHERE principaluri = ?', $this->schedulingObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri]);
-
-        $result = [];
-        foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-            $result[] = [
-                'calendardata' => $row['calendardata'],
-                'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
-                'etag'         => '"' . $row['etag'] . '"',
-                'size'         => (int)$row['size'],
-            ];
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Deletes a scheduling object
-     *
-     * @param string $principalUri
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteSchedulingObject($principalUri, $objectUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri]);
+
+		$result = [];
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+			$result[] = [
+				'calendardata' => $row['calendardata'],
+				'uri'          => $row['uri'],
+				'lastmodified' => $row['lastmodified'],
+				'etag'         => '"' . $row['etag'] . '"',
+				'size'         => (int)$row['size'],
+			];
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * Deletes a scheduling object
+	 *
+	 * @param string $principalUri
+	 * @param string $objectUri
+	 * @return void
+	 */
+	public function deleteSchedulingObject($principalUri, $objectUri) {
 
 		$query = sprintf('DELETE FROM %s WHERE principaluri = ? && uri = ?', $this->schedulingObjectTableName);	
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri, $objectUri]);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri, $objectUri]);
 
-    }
+	}
 
-    /**
-     * Creates a new scheduling object. This should land in a users' inbox.
-     *
-     * @param string $principalUri
-     * @param string $objectUri
-     * @param string $objectData
-     * @return void
-     */
-    public function createSchedulingObject($principalUri, $objectUri, $objectData) {
+	/**
+	 * Creates a new scheduling object. This should land in a users' inbox.
+	 *
+	 * @param string $principalUri
+	 * @param string $objectUri
+	 * @param string $objectData
+	 * @return void
+	 */
+	public function createSchedulingObject($principalUri, $objectUri, $objectData) {
 
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->schedulingObjectTableName . ' (principaluri, calendardata, uri, lastmodified, etag, size) VALUES (?, ?, ?, ?, ?, ?)');
-        $stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData) ]);
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->schedulingObjectTableName . ' (principaluri, calendardata, uri, lastmodified, etag, size) VALUES (?, ?, ?, ?, ?, ?)');
+		$stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData) ]);
 
-    }
+	}
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -1024,7 +1024,7 @@
      * @param string $principalUri
      * @param string $uri
      * @param array $properties
-     * @return mixed
+     * @return string
      */
     public function createSubscription($principalUri, $uri, array $properties) {
 

Spacing +11 added lines, -11 removed lines

@@ -366,7 +366,7 @@ 
                 'lastmodified' => $row['lastmodified'],
                 'etag'         => '"' . $row['etag'] . '"',
                 'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
+                'size'         => (int) $row['size'],
                 'component'    => strtolower($row['componenttype']),
             ];
         }
@@ -406,7 +406,7 @@ 
             'lastmodified'  => $row['lastmodified'],
             'etag'          => '"' . $row['etag'] . '"',
             'calendarid'    => $row['calendarid'],
-            'size'          => (int)$row['size'],
+            'size'          => (int) $row['size'],
             'calendardata'  => $row['calendardata'],
             'component'     => strtolower($row['componenttype']),
          ];
@@ -427,7 +427,7 @@ 
      */
     public function getMultipleCalendarObjects($calendarId, array $uris) {
 
-        $query =sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri IN (', $this->calendarObjectTableName);
+        $query = sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri IN (', $this->calendarObjectTableName);
         // Inserting a whole bunch of question marks
         $query .= implode(',', array_fill(0, count($uris), '?'));
         $query .= ')';
@@ -444,7 +444,7 @@ 
                 'lastmodified' => $row['lastmodified'],
                 'etag'         => '"' . $row['etag'] . '"',
                 'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
+                'size'         => (int) $row['size'],
                 'calendardata' => $row['calendardata'],
                 'component'    => strtolower($row['componenttype']),
             ];
@@ -553,7 +553,7 @@ 
         foreach ($vObject->getComponents() as $component) {
             if ($component->name !== 'VTIMEZONE') {
                 $componentType = $component->name;
-                $uid = (string)$component->UID;
+                $uid = (string) $component->UID;
                 break;
             }
         }
@@ -578,7 +578,7 @@ 
                     $lastOccurence = $firstOccurence;
                 }
             } else {
-                $it = new VObject\Recur\EventIterator($vObject, (string)$component->UID);
+                $it = new VObject\Recur\EventIterator($vObject, (string) $component->UID);
                 $maxDate = new \DateTime(self::MAX_DATE);
                 if ($it->isInfinite()) {
                     $lastOccurence = $maxDate->getTimeStamp();
@@ -859,7 +859,7 @@ 
         // Current synctoken
 		$query = sprintf('SELECT synctoken FROM %s WHERE id = ?', $this->calendarTableName);
         $stmt = $this->pdo->prepare($query);
-        $stmt->execute([ $calendarId ]);
+        $stmt->execute([$calendarId]);
         $currentToken = $stmt->fetchColumn(0);
 
         if (is_null($currentToken)) return null;
@@ -874,7 +874,7 @@ 
         if ($syncToken) {
 
             $query = sprintf('SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && calendarid = ? ORDER BY synctoken', $this->calendarChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+            if ($limit > 0) $query .= " LIMIT " . (int) $limit;
 
             // Fetching all changes
             $stmt = $this->pdo->prepare($query);
@@ -1157,7 +1157,7 @@ 
             'calendardata' => $row['calendardata'],
             'lastmodified' => $row['lastmodified'],
             'etag'         => '"' . $row['etag'] . '"',
-            'size'         => (int)$row['size'],
+            'size'         => (int) $row['size'],
          ];
 
     }
@@ -1186,7 +1186,7 @@ 
                 'uri'          => $row['uri'],
                 'lastmodified' => $row['lastmodified'],
                 'etag'         => '"' . $row['etag'] . '"',
-                'size'         => (int)$row['size'],
+                'size'         => (int) $row['size'],
             ];
         }
 
@@ -1220,7 +1220,7 @@ 
     public function createSchedulingObject($principalUri, $objectUri, $objectData) {
 
         $stmt = $this->pdo->prepare('INSERT INTO ' . $this->schedulingObjectTableName . ' (principaluri, calendardata, uri, lastmodified, etag, size) VALUES (?, ?, ?, ?, ?, ?)');
-        $stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData) ]);
+        $stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData)]);
 
     }