nextcloud / server

apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php

Indentation +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@
  */
 class EntityTooLarge extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 413;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 413;
+    }
 }

apps/dav/lib/Connector/Sabre/TagList.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 			return null;
 		}
 		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
+			if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}tag') {
 				$tags[] = $elem['value'];
 			}
 		}
@@ -116,7 +116,7 @@ 
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->tags as $tag) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}tag', $tag);
 		}
 	}
 }

Indentation +79 added lines, -79 removed lines

@@ -34,89 +34,89 @@
  * This property contains multiple "tag" elements, each containing a tag name.
  */
 class TagList implements Element {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * tags
-	 *
-	 * @var array
-	 */
-	private $tags;
+    /**
+     * tags
+     *
+     * @var array
+     */
+    private $tags;
 
-	/**
-	 * @param array $tags
-	 */
-	public function __construct(array $tags) {
-		$this->tags = $tags;
-	}
+    /**
+     * @param array $tags
+     */
+    public function __construct(array $tags) {
+        $this->tags = $tags;
+    }
 
-	/**
-	 * Returns the tags
-	 *
-	 * @return array
-	 */
-	public function getTags() {
-		return $this->tags;
-	}
+    /**
+     * Returns the tags
+     *
+     * @return array
+     */
+    public function getTags() {
+        return $this->tags;
+    }
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * This method is called statictly, this is because in theory this method
-	 * may be used as a type of constructor, or factory method.
-	 *
-	 * Often you want to return an instance of the current class, but you are
-	 * free to return other data as well.
-	 *
-	 * You are responsible for advancing the reader to the next element. Not
-	 * doing anything will result in a never-ending loop.
-	 *
-	 * If you just want to skip parsing for this element altogether, you can
-	 * just call $reader->next();
-	 *
-	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-	 * the next element.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$tags = [];
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statictly, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $tags = [];
 
-		$tree = $reader->parseInnerTree();
-		if ($tree === null) {
-			return null;
-		}
-		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
-				$tags[] = $elem['value'];
-			}
-		}
-		return new self($tags);
-	}
+        $tree = $reader->parseInnerTree();
+        if ($tree === null) {
+            return null;
+        }
+        foreach ($tree as $elem) {
+            if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
+                $tags[] = $elem['value'];
+            }
+        }
+        return new self($tags);
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->tags as $tag) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->tags as $tag) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -87,10 +87,10 @@
 	 * @return void
 	 */
 	public function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
+		$propFind->handle('{DAV:}supportedlock', function() {
 			return new SupportedLock(true);
 		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+		$propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
 			return new LockDiscovery([]);
 		});
 	}

Indentation +99 added lines, -99 removed lines

@@ -47,113 +47,113 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class FakeLockerPlugin extends ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	private $server;
+    /** @var \Sabre\DAV\Server */
+    private $server;
 
-	/** {@inheritDoc} */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
-		$this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
-		$server->on('propFind', [$this, 'propFind']);
-		$server->on('validateTokens', [$this, 'validateTokens']);
-	}
+    /** {@inheritDoc} */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
+        $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
+        $server->on('propFind', [$this, 'propFind']);
+        $server->on('validateTokens', [$this, 'validateTokens']);
+    }
 
-	/**
-	 * Indicate that we support LOCK and UNLOCK
-	 *
-	 * @param string $path
-	 * @return string[]
-	 */
-	public function getHTTPMethods($path) {
-		return [
-			'LOCK',
-			'UNLOCK',
-		];
-	}
+    /**
+     * Indicate that we support LOCK and UNLOCK
+     *
+     * @param string $path
+     * @return string[]
+     */
+    public function getHTTPMethods($path) {
+        return [
+            'LOCK',
+            'UNLOCK',
+        ];
+    }
 
-	/**
-	 * Indicate that we support locking
-	 *
-	 * @return integer[]
-	 */
-	public function getFeatures() {
-		return [2];
-	}
+    /**
+     * Indicate that we support locking
+     *
+     * @return integer[]
+     */
+    public function getFeatures() {
+        return [2];
+    }
 
-	/**
-	 * Return some dummy response for PROPFIND requests with regard to locking
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
-			return new SupportedLock(true);
-		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
-			return new LockDiscovery([]);
-		});
-	}
+    /**
+     * Return some dummy response for PROPFIND requests with regard to locking
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $propFind->handle('{DAV:}supportedlock', function () {
+            return new SupportedLock(true);
+        });
+        $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+            return new LockDiscovery([]);
+        });
+    }
 
-	/**
-	 * Mark a locking token always as valid
-	 *
-	 * @param RequestInterface $request
-	 * @param array $conditions
-	 */
-	public function validateTokens(RequestInterface $request, &$conditions) {
-		foreach ($conditions as &$fileCondition) {
-			if (isset($fileCondition['tokens'])) {
-				foreach ($fileCondition['tokens'] as &$token) {
-					if (isset($token['token'])) {
-						if (substr($token['token'], 0, 16) === 'opaquelocktoken:') {
-							$token['validToken'] = true;
-						}
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Mark a locking token always as valid
+     *
+     * @param RequestInterface $request
+     * @param array $conditions
+     */
+    public function validateTokens(RequestInterface $request, &$conditions) {
+        foreach ($conditions as &$fileCondition) {
+            if (isset($fileCondition['tokens'])) {
+                foreach ($fileCondition['tokens'] as &$token) {
+                    if (isset($token['token'])) {
+                        if (substr($token['token'], 0, 16) === 'opaquelocktoken:') {
+                            $token['validToken'] = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeLockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
-		$lockInfo = new LockInfo();
-		$lockInfo->token = md5($request->getPath());
-		$lockInfo->uri = $request->getPath();
-		$lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
-		$lockInfo->timeout = 1800;
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeLockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
+        $lockInfo = new LockInfo();
+        $lockInfo->token = md5($request->getPath());
+        $lockInfo->uri = $request->getPath();
+        $lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
+        $lockInfo->timeout = 1800;
 
-		$body = $this->server->xml->write('{DAV:}prop', [
-			'{DAV:}lockdiscovery' =>
-					new LockDiscovery([$lockInfo])
-		]);
+        $body = $this->server->xml->write('{DAV:}prop', [
+            '{DAV:}lockdiscovery' =>
+                    new LockDiscovery([$lockInfo])
+        ]);
 
-		$response->setStatus(200);
-		$response->setBody($body);
+        $response->setStatus(200);
+        $response->setBody($body);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeUnlockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
-		$response->setStatus(204);
-		$response->setHeader('Content-Length', '0');
-		return false;
-	}
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeUnlockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
+        $response->setStatus(204);
+        $response->setHeader('Content-Length', '0');
+        return false;
+    }
 }

apps/dav/lib/Connector/Sabre/ChecksumList.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}checksum', $checksum);
 		}
 	}
 }

Indentation +33 added lines, -33 removed lines

@@ -32,40 +32,40 @@
  * checksum name.
  */
 class ChecksumList implements XmlSerializable {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private $checksums;
+    /** @var string[] of TYPE:CHECKSUM */
+    private $checksums;
 
-	/**
-	 * @param string $checksum
-	 */
-	public function __construct($checksum) {
-		$this->checksums = explode(',', $checksum);
-	}
+    /**
+     * @param string $checksum
+     */
+    public function __construct($checksum) {
+        $this->checksums = explode(',', $checksum);
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->checksums as $checksum) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/ShareTypeList.php

Spacing +3 added lines, -3 removed lines

@@ -71,8 +71,8 @@ 
 			return null;
 		}
 		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
+			if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}share-type') {
+				$shareTypes[] = (int) $elem['value'];
 			}
 		}
 		return new self($shareTypes);
@@ -86,7 +86,7 @@ 
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}share-type', $shareType);
 		}
 	}
 }

Indentation +51 added lines, -51 removed lines

@@ -32,61 +32,61 @@
  * This property contains multiple "share-type" elements, each containing a share type.
  */
 class ShareTypeList implements Element {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * Share types
-	 *
-	 * @var int[]
-	 */
-	private $shareTypes;
+    /**
+     * Share types
+     *
+     * @var int[]
+     */
+    private $shareTypes;
 
-	/**
-	 * @param int[] $shareTypes
-	 */
-	public function __construct($shareTypes) {
-		$this->shareTypes = $shareTypes;
-	}
+    /**
+     * @param int[] $shareTypes
+     */
+    public function __construct($shareTypes) {
+        $this->shareTypes = $shareTypes;
+    }
 
-	/**
-	 * Returns the share types
-	 *
-	 * @return int[]
-	 */
-	public function getShareTypes() {
-		return $this->shareTypes;
-	}
+    /**
+     * Returns the share types
+     *
+     * @return int[]
+     */
+    public function getShareTypes() {
+        return $this->shareTypes;
+    }
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$shareTypes = [];
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $shareTypes = [];
 
-		$tree = $reader->parseInnerTree();
-		if ($tree === null) {
-			return null;
-		}
-		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
-				$shareTypes[] = (int)$elem['value'];
-			}
-		}
-		return new self($shareTypes);
-	}
+        $tree = $reader->parseInnerTree();
+        if ($tree === null) {
+            return null;
+        }
+        foreach ($tree as $elem) {
+            if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') {
+                $shareTypes[] = (int)$elem['value'];
+            }
+        }
+        return new self($shareTypes);
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->shareTypes as $shareType) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->shareTypes as $shareType) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType);
+        }
+    }
 }

apps/dav/lib/CalDAV/CalendarHome.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 			}
 		}
 
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
+		throw new NotFound('Node with name \''.$name.'\' could not be found');
 	}
 
 	/**

Indentation +162 added lines, -162 removed lines

@@ -44,166 +44,166 @@
 
 class CalendarHome extends \Sabre\CalDAV\CalendarHome {
 
-	/** @var \OCP\IL10N */
-	private $l10n;
-
-	/** @var \OCP\IConfig */
-	private $config;
-
-	/** @var PluginManager */
-	private $pluginManager;
-
-	/** @var bool */
-	private $returnCachedSubscriptions = false;
-
-	public function __construct(BackendInterface $caldavBackend, $principalInfo) {
-		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
-		$this->config = \OC::$server->getConfig();
-		$this->pluginManager = new PluginManager(
-			\OC::$server,
-			\OC::$server->getAppManager()
-		);
-	}
-
-	/**
-	 * @return BackendInterface
-	 */
-	public function getCalDAVBackend() {
-		return $this->caldavBackend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function createExtendedCollection($name, MkCol $mkCol): void {
-		$reservedNames = [
-			BirthdayService::BIRTHDAY_CALENDAR_URI,
-			TrashbinHome::NAME,
-		];
-
-		if (\in_array($name, $reservedNames, true) || ExternalCalendar::doesViolateReservedName($name)) {
-			throw new MethodNotAllowed('The resource you tried to create has a reserved name');
-		}
-
-		parent::createExtendedCollection($name, $mkCol);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getChildren() {
-		$calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-		$objects = [];
-		foreach ($calendars as $calendar) {
-			$objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-		}
-
-		if ($this->caldavBackend instanceof SchedulingSupport) {
-			$objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-			$objects[] = new Outbox($this->config, $this->principalInfo['uri']);
-		}
-
-		// We're adding a notifications node, if it's supported by the backend.
-		if ($this->caldavBackend instanceof NotificationSupport) {
-			$objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-
-		if ($this->caldavBackend instanceof CalDavBackend) {
-			$objects[] = new TrashbinHome($this->caldavBackend, $this->principalInfo);
-		}
-
-		// If the backend supports subscriptions, we'll add those as well,
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($this->returnCachedSubscriptions) {
-					$objects[] = new CachedSubscription($this->caldavBackend, $subscription);
-				} else {
-					$objects[] = new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-		}
-
-		foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
-			/** @var ICalendarProvider $calendarPlugin */
-			$calendars = $calendarPlugin->fetchAllForCalendarHome($this->principalInfo['uri']);
-			foreach ($calendars as $calendar) {
-				$objects[] = $calendar;
-			}
-		}
-
-		return $objects;
-	}
-
-	/**
-	 * @param string $name
-	 *
-	 * @return INode
-	 */
-	public function getChild($name) {
-		// Special nodes
-		if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
-			return new Outbox($this->config, $this->principalInfo['uri']);
-		}
-		if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
-			return new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-		}
-		if ($name === TrashbinHome::NAME && $this->caldavBackend instanceof CalDavBackend) {
-			return new TrashbinHome($this->caldavBackend, $this->principalInfo);
-		}
-
-		// Calendars
-		foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
-			if ($calendar['uri'] === $name) {
-				return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
-			}
-		}
-
-		if ($this->caldavBackend instanceof SubscriptionSupport) {
-			foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
-				if ($subscription['uri'] === $name) {
-					if ($this->returnCachedSubscriptions) {
-						return new CachedSubscription($this->caldavBackend, $subscription);
-					}
-
-					return new Subscription($this->caldavBackend, $subscription);
-				}
-			}
-		}
-
-		if (ExternalCalendar::isAppGeneratedCalendar($name)) {
-			[$appId, $calendarUri] = ExternalCalendar::splitAppGeneratedCalendarUri($name);
-
-			foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
-				/** @var ICalendarProvider $calendarPlugin */
-				if ($calendarPlugin->getAppId() !== $appId) {
-					continue;
-				}
-
-				if ($calendarPlugin->hasCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri)) {
-					return $calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri);
-				}
-			}
-		}
-
-		throw new NotFound('Node with name \'' . $name . '\' could not be found');
-	}
-
-	/**
-	 * @param array $filters
-	 * @param integer|null $limit
-	 * @param integer|null $offset
-	 */
-	public function calendarSearch(array $filters, $limit = null, $offset = null) {
-		$principalUri = $this->principalInfo['uri'];
-		return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
-	}
-
-
-	public function enableCachedSubscriptionsForThisRequest() {
-		$this->returnCachedSubscriptions = true;
-	}
+    /** @var \OCP\IL10N */
+    private $l10n;
+
+    /** @var \OCP\IConfig */
+    private $config;
+
+    /** @var PluginManager */
+    private $pluginManager;
+
+    /** @var bool */
+    private $returnCachedSubscriptions = false;
+
+    public function __construct(BackendInterface $caldavBackend, $principalInfo) {
+        parent::__construct($caldavBackend, $principalInfo);
+        $this->l10n = \OC::$server->getL10N('dav');
+        $this->config = \OC::$server->getConfig();
+        $this->pluginManager = new PluginManager(
+            \OC::$server,
+            \OC::$server->getAppManager()
+        );
+    }
+
+    /**
+     * @return BackendInterface
+     */
+    public function getCalDAVBackend() {
+        return $this->caldavBackend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function createExtendedCollection($name, MkCol $mkCol): void {
+        $reservedNames = [
+            BirthdayService::BIRTHDAY_CALENDAR_URI,
+            TrashbinHome::NAME,
+        ];
+
+        if (\in_array($name, $reservedNames, true) || ExternalCalendar::doesViolateReservedName($name)) {
+            throw new MethodNotAllowed('The resource you tried to create has a reserved name');
+        }
+
+        parent::createExtendedCollection($name, $mkCol);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getChildren() {
+        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
+        $objects = [];
+        foreach ($calendars as $calendar) {
+            $objects[] = new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+        }
+
+        if ($this->caldavBackend instanceof SchedulingSupport) {
+            $objects[] = new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+            $objects[] = new Outbox($this->config, $this->principalInfo['uri']);
+        }
+
+        // We're adding a notifications node, if it's supported by the backend.
+        if ($this->caldavBackend instanceof NotificationSupport) {
+            $objects[] = new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+
+        if ($this->caldavBackend instanceof CalDavBackend) {
+            $objects[] = new TrashbinHome($this->caldavBackend, $this->principalInfo);
+        }
+
+        // If the backend supports subscriptions, we'll add those as well,
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($this->returnCachedSubscriptions) {
+                    $objects[] = new CachedSubscription($this->caldavBackend, $subscription);
+                } else {
+                    $objects[] = new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+        }
+
+        foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
+            /** @var ICalendarProvider $calendarPlugin */
+            $calendars = $calendarPlugin->fetchAllForCalendarHome($this->principalInfo['uri']);
+            foreach ($calendars as $calendar) {
+                $objects[] = $calendar;
+            }
+        }
+
+        return $objects;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return INode
+     */
+    public function getChild($name) {
+        // Special nodes
+        if ($name === 'inbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Inbox($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === 'outbox' && $this->caldavBackend instanceof SchedulingSupport) {
+            return new Outbox($this->config, $this->principalInfo['uri']);
+        }
+        if ($name === 'notifications' && $this->caldavBackend instanceof NotificationSupport) {
+            return new \Sabre\CalDAV\Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
+        }
+        if ($name === TrashbinHome::NAME && $this->caldavBackend instanceof CalDavBackend) {
+            return new TrashbinHome($this->caldavBackend, $this->principalInfo);
+        }
+
+        // Calendars
+        foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
+            if ($calendar['uri'] === $name) {
+                return new Calendar($this->caldavBackend, $calendar, $this->l10n, $this->config);
+            }
+        }
+
+        if ($this->caldavBackend instanceof SubscriptionSupport) {
+            foreach ($this->caldavBackend->getSubscriptionsForUser($this->principalInfo['uri']) as $subscription) {
+                if ($subscription['uri'] === $name) {
+                    if ($this->returnCachedSubscriptions) {
+                        return new CachedSubscription($this->caldavBackend, $subscription);
+                    }
+
+                    return new Subscription($this->caldavBackend, $subscription);
+                }
+            }
+        }
+
+        if (ExternalCalendar::isAppGeneratedCalendar($name)) {
+            [$appId, $calendarUri] = ExternalCalendar::splitAppGeneratedCalendarUri($name);
+
+            foreach ($this->pluginManager->getCalendarPlugins() as $calendarPlugin) {
+                /** @var ICalendarProvider $calendarPlugin */
+                if ($calendarPlugin->getAppId() !== $appId) {
+                    continue;
+                }
+
+                if ($calendarPlugin->hasCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri)) {
+                    return $calendarPlugin->getCalendarInCalendarHome($this->principalInfo['uri'], $calendarUri);
+                }
+            }
+        }
+
+        throw new NotFound('Node with name \'' . $name . '\' could not be found');
+    }
+
+    /**
+     * @param array $filters
+     * @param integer|null $limit
+     * @param integer|null $offset
+     */
+    public function calendarSearch(array $filters, $limit = null, $offset = null) {
+        $principalUri = $this->principalInfo['uri'];
+        return $this->caldavBackend->calendarSearch($principalUri, $filters, $limit, $offset);
+    }
+
+
+    public function enableCachedSubscriptionsForThisRequest() {
+        $this->returnCachedSubscriptions = true;
+    }
 }

apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php

Indentation +50 added lines, -50 removed lines

@@ -25,58 +25,58 @@
 
 class Publisher implements XmlSerializable {
 
-	/**
-	 * @var string $publishUrl
-	 */
-	protected $publishUrl;
+    /**
+     * @var string $publishUrl
+     */
+    protected $publishUrl;
 
-	/**
-	 * @var boolean $isPublished
-	 */
-	protected $isPublished;
+    /**
+     * @var boolean $isPublished
+     */
+    protected $isPublished;
 
-	/**
-	 * @param string $publishUrl
-	 * @param boolean $isPublished
-	 */
-	public function __construct($publishUrl, $isPublished) {
-		$this->publishUrl = $publishUrl;
-		$this->isPublished = $isPublished;
-	}
+    /**
+     * @param string $publishUrl
+     * @param boolean $isPublished
+     */
+    public function __construct($publishUrl, $isPublished) {
+        $this->publishUrl = $publishUrl;
+        $this->isPublished = $isPublished;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getValue() {
-		return $this->publishUrl;
-	}
+    /**
+     * @return string
+     */
+    public function getValue() {
+        return $this->publishUrl;
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		if (!$this->isPublished) {
-			// for pre-publish-url
-			$writer->write($this->publishUrl);
-		} else {
-			// for publish-url
-			$writer->writeElement('{DAV:}href', $this->publishUrl);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        if (!$this->isPublished) {
+            // for pre-publish-url
+            $writer->write($this->publishUrl);
+        } else {
+            // for publish-url
+            $writer->writeElement('{DAV:}href', $this->publishUrl);
+        }
+    }
 }

apps/dav/lib/CalDAV/PublicCalendarObject.php

Indentation +7 added lines, -7 removed lines

@@ -23,11 +23,11 @@
 
 class PublicCalendarObject extends CalendarObject {
 
-	/**
-	 * public calendars are always shared
-	 * @return bool
-	 */
-	protected function isShared() {
-		return true;
-	}
+    /**
+     * public calendars are always shared
+     * @return bool
+     */
+    protected function isShared() {
+        return true;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/SearchTermFilter.php

Indentation +12 added lines, -12 removed lines

@@ -27,17 +27,17 @@
 
 class SearchTermFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$value = $reader->parseInnerTree();
-		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
-		}
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $value = $reader->parseInnerTree();
+        if (!is_string($value)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	public static function xmlDeserialize(Reader $reader) {
 		$value = $reader->parseInnerTree();
 		if (!is_string($value)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}search-term has illegal value');
+			throw new BadRequest('The {'.SearchPlugin::NS_Nextcloud.'}search-term has illegal value');
 		}
 
 		return $value;