fix(dav): Allow array of array of scalars, and fix error message

Signed-off-by: Côme Chilliet <[email protected]>

apps/dav/lib/DAV/CustomPropertiesBackend.php

@@ -415,6 +415,18 @@
 		return $path;
 	}
 
+	private static function checkIsArrayOfScalar(string $name, array $array): void {
+		foreach ($array as $item) {
+			if (is_array($item)) {
+				self::checkIsArrayOfScalar($name, $item);
+			} elseif ($item !== null && !is_scalar($item)) {
+				throw new DavException(
+					"Property \"$name\" has an invalid value of array containing " . gettype($item),
+				);
+			}
+		}
+	}
+
 	/**
 	 * @param mixed $value
 	 * @return array
@@ -428,25 +440,20 @@
 		} else {
 			if (is_array($value)) {
 				// For array only allow scalar values
-				foreach ($value as $item) {
-					if (!is_scalar($item)) {
-						throw new DavException(
-							"Property \"$name\" has an invalid value of array containing " . gettype($value),
-						);
-					}
-				}
+				self::checkIsArrayOfScalar($name, $value);
 			} elseif (!is_object($value)) {
 				throw new DavException(
 					"Property \"$name\" has an invalid value of type " . gettype($value),
 				);
-			}
-			if (!str_starts_with($value::class, 'Sabre\\DAV\\Xml\\Property\\')
-				&& !str_starts_with($value::class, 'Sabre\\CalDAV\\Xml\\Property\\')
-				&& !str_starts_with($value::class, 'Sabre\\CardDAV\\Xml\\Property\\')
-				&& !str_starts_with($value::class, 'OCA\\DAV\\')) {
-				throw new DavException(
-					"Property \"$name\" has an invalid value of class " . $value::class,
-				);
+			} else {
+				if (!str_starts_with($value::class, 'Sabre\\DAV\\Xml\\Property\\')
+					&& !str_starts_with($value::class, 'Sabre\\CalDAV\\Xml\\Property\\')
+					&& !str_starts_with($value::class, 'Sabre\\CardDAV\\Xml\\Property\\')
+					&& !str_starts_with($value::class, 'OCA\\DAV\\')) {
+					throw new DavException(
+						"Property \"$name\" has an invalid value of class " . $value::class,
+					);
+				}
 			}
 			$valueType = self::PROPERTY_TYPE_OBJECT;
 			$value = serialize($value);
@@ -457,7 +464,7 @@
 	/**
 	 * @return mixed|Complex|string
 	 */
 	private function decodeValueFromDatabase(string $value, int $valueType): mixed {
 		switch ($valueType) {
 			case self::PROPERTY_TYPE_XML:
 				return new Complex($value);