fixup! feat(dav): implement updating a principal's schedule-default-c…

…alendar-URL
nextcloud · Feb 27, 2024 · d7a272d · d7a272d
1 parent d6b267f
commit d7a272d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php
@@ -42,6 +42,7 @@
 use Sabre\DAV\Xml\Property\Complex;
 use Sabre\DAV\Xml\Property\Href;
 use Sabre\DAV\Xml\Property\LocalHref;
+use Sabre\Xml\ParseException;
 use Sabre\Xml\Service as XmlService;
 
 use function array_intersect;
@@ -520,6 +521,10 @@ private function formatPath(string $path): string {
 		return $path;
 	}
 
+	/**
+	 * @throws ParseException If parsing a \Sabre\DAV\Xml\Property\Complex value fails
+	 * @throws DavException If the property value is invalid
+	 */
 	private function encodeValueForDatabase(string $path, string $name, mixed $value): array {
 		// Try to parse a more specialized property type first
 		if ($value instanceof Complex) {
@@ -534,7 +539,7 @@ private function encodeValueForDatabase(string $path, string $name, mixed $value
 		try {
 			$this->validateProperty($path, $name, $value);
 		} catch (DavException $e) {
-			throw new \Exception(
+			throw new DavException(
 				"Property \"$name\" has an invalid value: " . $e->getMessage(),
 				0,
 				$e,

diff --git a/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php b/apps/dav/tests/unit/DAV/CustomPropertiesBackendTest.php
@@ -137,7 +137,7 @@ protected function getProps(string $user, string $path) {
 		$data = [];
 		while ($row = $result->fetch()) {
 			$value = $row['propertyvalue'];
-			if ($row['valuetype'] === CustomPropertiesBackend::PROPERTY_TYPE_HREF) {
+			if ((int)$row['valuetype'] === CustomPropertiesBackend::PROPERTY_TYPE_HREF) {
 				$value = new Href($value);
 			}
 			$data[$row['propertyname']] = $value;