Merge pull request #2537 from nextcloud/backport/2533/stable28

[stable28] feat: Handle complex location type
nextcloud · Jul 8, 2024 · 1828dea · 1828dea
2 parents d704c3f + d014471
commit 1828dea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0', '8.1', '8.2', '8.3']
-        server-versions: ['master']
+        server-versions: ['stable28']
         mysql-versions: ['8.1']
 
     name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}

diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.2']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     services:
       oracle:

diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.2']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     services:
       postgres:

diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.2']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     steps:
       - name: Set app env

diff --git a/lib/Sabre/PropFindPlugin.php b/lib/Sabre/PropFindPlugin.php
@@ -40,6 +40,7 @@
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 use Sabre\DAV\Tree;
+use Sabre\DAV\Xml\Property\Complex;
 
 class PropFindPlugin extends ServerPlugin {
 	public const ORIGINAL_NAME_PROPERTYNAME = '{http://nextcloud.org/ns}original-name';
@@ -145,6 +146,10 @@ public function handleUpdateProperties($path, PropPatch $propPatch): void {
 		$node = $this->tree->getNodeForPath($path);
 		if ($node instanceof AlbumRoot) {
 			$propPatch->handle(self::LOCATION_PROPERTYNAME, function ($location) use ($node) {
+				if ($location instanceof Complex) {
+					$location = $location->getXml();
+				}
+
 				$this->albumMapper->setLocation($node->getAlbum()->getAlbum()->getId(), $location);
 				return true;
 			});